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

Merge "Fix -Wnullable-to-nonnull-conversion error" am: e2e9d546 am: 84006802 am: 64e5cb39 am: cc9aa739 am: e8dcf868

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



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