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

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

Change-Id: Iaeddc252f3242f89b93f9a540261787df2a937e4