[conflict] Merge "Fix some nullable warnings." into udc-dev am: 9caf24df

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/modules/Permission/+/23048845



Change-Id: Iad9df87480f8637bc6ddd13056b217592ad2872e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
Relnote: N/A