Merge "Fix more kotlin 1.7.0 errors" am: 78ef274d am: f06660f5 am: 7ff4b5d0

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



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