Merge "Fix NPE" into rvc-dev am: e26a6086 am: 37d0062f am: d3910354 am: f0e5a289

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



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