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

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

Change-Id: I1423ebe6cca3f2f434bb162f454cc883f5057103