[automerger skipped] Fix type inference errors with kotlinc 1.9.0 am: 33e518094d -s ours

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

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

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