Merge "Fix -Wnullable-to-nonnull-conversion error" am: e2e9d546 am: 84006802

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



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