Merge "Merge "Fix NPE" into rvc-qpr-dev am: 9fa47ab9 am: 9cb37b0f am:...

Merge "Merge "Fix NPE" into rvc-qpr-dev am: 9fa47ab9 am: 9cb37b0f am: eff219ab am: 882e5d7f am: fd86694c am: 1451b1b4" into tm-d1-dev-plus-aosp am: 9ecd5b68 am: 116b2415

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



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