Merge "Fix -Wnullable-to-nonnull-conversion error" am: e2e9d546df

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

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