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

[automerger skipped] Merge "Update SysUI to be compatible with latest Jetpack libraries" into tm-dev am: 8a86bf91 am: af930c78 -s ours am: 46425d35 -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: I2ba141e0d265039a020e3a4f2373565eaef1e8f4
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>