Merge "Fix an obscure NPE" into rvc-dev am: fe96fa8b19 am: f4734b2025
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/11844113 Change-Id: I352e0052428698290d0ddb8f2680f0c03269f7b2
This commit is contained in: