Merge "Fix the Nullable pointer is dereferenced issue" am: 1b287f39 am:...

Merge "Fix the Nullable pointer is dereferenced issue" am: 1b287f39 am: cdb3ecb1 am: c28f7784 am: 3a6f9fb3 am: 6fe4ea48

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



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