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

[automerger skipped] Update SysUI to be compatible with latest Jetpack libraries am: b65b4798 -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: I4b93716be79c7433aabdf6ff07a3b8f28c18eafe
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>