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