Merge "Fix kotlin nullable errors in frameworks/base" into main am: b2c5221cd7 am: 1294ccba62 am: c7ed3e52d6

Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/2700098

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