Merge "Small fixes for Kotlin 2." into main am: d6c2e676

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



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