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