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

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

Change-Id: Icaee0b99c6c698a99d93185bbd46da1d8d0e90c0