[automerger skipped] Merge "Small fixes for Kotlin 2." into main am:...

[automerger skipped] Merge "Small fixes for Kotlin 2." into main am: d6c2e676 am: 6b3d1613 -s ours

am skip reason: skipped by mankoff

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



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