Merge "Fix NPE" into rvc-dev am: e26a608623 am: 37d0062f31 am: d39103545d am: f0e5a2896b

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>