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