[automerger skipped] Merge "Fix more kotlin 1.7.0 errors" am: 78ef274d am:...

[automerger skipped] Merge "Fix more kotlin 1.7.0 errors" am: 78ef274d am: f06660f5 am: 7ff4b5d0 am: e9fd5bf8 -s ours

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

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



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