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

Merge "Merge "Fix potential NPE & clean up some logic" into tm-dev am: 5126e8b1 am: 7d2923a9 am: 4e4780be" into tm-qpr-dev-plus-aosp am: f419ea99

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



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