[automerger skipped] Merge "Fix more kotlin 1.7.0 errors" into tm-qpr-dev am: b6b58d09 -s ours

am skip reason: Merged-In I2c1b1f7581426496f31198896c4ff3bd9abf2941 with SHA-1 61be7871 is already in history

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



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