[automerger skipped] Merge "Fix SystemUI build for kotlin 1.7.0" into...

[automerger skipped] Merge "Fix SystemUI build for kotlin 1.7.0" into tm-qpr-dev am: 6947499a -s ours am: fab82f89 -s ours

am skip reason: Merged-In Ib1605aaff28492b557deac4156f3cc2f4cf8b329 with SHA-1 004f092e is already in history

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



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