Merge "Guard against NPE" into rvc-qpr-dev am: cc514fd00d am: 5e6bdc42ee

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

Change-Id: I972d7383e34a1e15d680f7078fe58cce45e07d26