Merge "Guard aginst another NPE" into rvc-qpr-dev am: 3f7fa9eb3a am: 70a4d6f738

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

Change-Id: I5c5c95aeb1a095ebbbfa855e6aab50ba60ae6162