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

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

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