Merge "Fix NPE" into rvc-qpr-dev am: 9fa47ab99b

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

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