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

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



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