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

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

Change-Id: I70b3d6d3850c4f12a85ba5be6d6c35b19069b5c9