[automerger skipped] Merge "Update SysUI to be compatible with latest Jetpack libraries" into tm-dev-plus-aosp am: f52aa191 am: 50beae2b am: a5875b3a -s ours

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

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



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