Merge "Bug fix: fix System crash due to NullPointerException." into sc-dev am: 6791ed0112

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15234896

Change-Id: Iaa8b3ee0377a16a5e5a790ea6dfd5451e77dfdf7