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

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

Change-Id: Iadc6dc27fa95544aefbad80065c94e154750f170