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

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



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