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

[automerger skipped] Merge "Fix SystemUI build for kotlin 1.7.0" into stage-aosp-master am: c735b93e -s ours am: 0d91882c -s ours

am skip reason: Merged-In Ib1605aaff28492b557deac4156f3cc2f4cf8b329 with SHA-1 6e3d0a66 is already in history

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



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