Merge "Fix potential NPE & clean up some logic" into tm-dev am: 5126e8b1b5 am: 7d2923a911 am: 253a6de538 am: b898341d2d
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/18421368 Change-Id: Icfbe49782a5f79df4791a659a3bdc3494adad013 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in: