Merge "Guard against NPE" into sc-dev am: b5d478b4cc am: d1cc7309e2
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15245692 Change-Id: Ib1b6cd9a96c0a6a7a4f848dbe9358ba0dc040964
This commit is contained in: