Merge "Fix possible NPE" into rvc-dev am: c3260a4c39

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

Change-Id: Ia95396f3c363fc64fa68aca790ea2799ab51bd9e