Merge "Bug fix: fix System crash due to NullPointerException." into sc-dev am: 6791ed0112 am: b6f5b2d050 am: 96a1ed2bb7
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15234896 Change-Id: I10430942c233ef229d902bba2cdd153516671289
This commit is contained in: