Merge "Fix kotlin nullable errors in frameworks/base" into main am: b2c5221c...

Merge "Fix kotlin nullable errors in frameworks/base" into main am: b2c5221c am: 1294ccba am: c7ed3e52 am: 3bf65d06

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



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