Merge "Merge "Protect against NPE" into rvc-dev am: 7f572a5a am: c2cddfd3...

Merge "Merge "Protect against NPE" into rvc-dev am: 7f572a5a am: c2cddfd3 am: 19a09aea" into rvc-qpr-dev-plus-aosp am: 1691d1f7

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

Change-Id: Icdf95b788d3d52ed556e7ceab5a411a3e164330f