Merge "Fix NPE" into rvc-qpr-dev am: 9fa47ab9 am: 9cb37b0f am: b4261e65 am: 982d229b

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



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