[automerger skipped] Merge "Adds core-ktx to SystemUI" into tm-qpr-dev am:...

[automerger skipped] Merge "Adds core-ktx to SystemUI" into tm-qpr-dev am: 2f5cb7b5 am: 51abdb79 -s ours

am skip reason: Merged-In I0f1d06ee662f0fbc164ab1712b1e8dc90aac14c3 with SHA-1 38859649 is already in history

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



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