Merge "Fix NPE" into rvc-dev am: e26a608623

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

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