Merge "[automerger skipped] Merge "Update SysUI to be compatible with latest...

Merge "[automerger skipped] Merge "Update SysUI to be compatible with latest Jetpack libraries" into tm-dev am: 8a86bf91 am: af930c78 am: 932170fd -s ours" into tm-qpr-dev-plus-aosp am: de3257c0 -s ours

am skip reason: Merged-In I9e793fb569f1bd6568b951d908d483fb4acfcd8c with SHA-1 95888176 is already in history

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



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