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

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

Change-Id: Ifb48dacc52190843c9dfac3a885ea150d8c71721