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

[automerger skipped] Merge "Update SysUI to be compatible with latest Jetpack libraries" am: b61b9e11 am: 77449e95 -s ours

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

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



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