[automerger skipped] Merge "Fix more kotlin 1.7.0 errors" into...

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

am skip reason: Merged-In I2c1b1f7581426496f31198896c4ff3bd9abf2941 with SHA-1 64acfee2 is already in history

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



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