[automerger skipped] Merge "Fix type inference errors with kotlinc 1.9.0" into...

[automerger skipped] Merge "Fix type inference errors with kotlinc 1.9.0" into udc-mainline-prod am: ce249674 -s ours

am skip reason: Merged-In I73573f097832f6f4d5983f364b0dca3a59ad88a8 with SHA-1 7477f38e is already in history

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



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