[automerger skipped] Fix more kotlin 1.7.0 errors am: 2bab49dd2f -s ours
am skip reason: Merged-In I2c1b1f7581426496f31198896c4ff3bd9abf2941 with SHA-1 61be78718f is already in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/20141046
Change-Id: If74e3c43965c850b331f99874d4c2c31c1f89bd0
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in: