Merge "Fix NPE" into rvc-qpr-dev am: 2760473c79 am: efc36ab41e

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

Change-Id: I5f832064eb9ce979f82ed9ebbd0129a690abe3a6