Merge "Merge "Bug fix: fix System crash due to NullPointerException." into sc-dev am: 6791ed01 am: e3bcc4a8" into sc-v2-dev-plus-aosp am: 44cb7f80

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

Change-Id: I65a2fd3422c18f0d5db4fd7b72d75605369bcf7e