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

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

Change-Id: Ic476da2bf8b8b7ef8870f0d0e57dd4c0b344ddfd