Merge "Fix potential NPE & clean up some logic" into tm-dev am: 5126e8b1 am:...

Merge "Fix potential NPE & clean up some logic" into tm-dev am: 5126e8b1 am: 7d2923a9 am: 253a6de5

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/18421368



Change-Id: Iaade53cb81d1c769f9869fdc6649ee68f0fcd115
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>