Merge "Fixed null pointer exception" into main am: 355524bd79

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

Change-Id: I7eb7c9468bb62f26a436099a5dcb4bd0de34eef5
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>