Merge "Fix possible NPE" into rvc-dev am: c3260a4c39 am: 76b4f45d1a am: cb7d0eab81
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/11978927 Change-Id: I4b4a822e23f8ef916513c5edc949a46610757872
This commit is contained in: