Merge "Fix the Nullable pointer is dereferenced issue" am: 1b287f39a5 am: cdb3ecb1fd am: c28f7784c4

Original change: https://android-review.googlesource.com/c/platform/frameworks/native/+/2583681

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