Merge "Protect against NPE" into rvc-dev am: 7f572a5a76 am: c2cddfd3b4

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

Change-Id: I8378d0f550c759c5ba612090553e186e7f3d4b7a