Merge "Fix NPE" into rvc-dev am: 880c4ce9e3 am: d135ca54f1
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/11710011 Change-Id: I145d5da5a74842a40c5120a9c184f86a8f13c591
This commit is contained in: