[automerger skipped] Fix more kotlin 1.7.0 errors am: 2bab49dd -s ours am: ac2f089c -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: If91cd6ea832bc36857b61bbe838866fd941e6a0c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>