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