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