[automerger skipped] Merge sc-dev-plus-aosp-without-vendor@7634622 am: 76b73572 -s ours am: 91dbca71 -s ours am: 10c03c06 -s ours am: c848499d -s ours

am skip reason: Merged-In I11a3aa23392b12f83d49fe64c3c208daa980e8dd with SHA-1 9cb069bb is already in history

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/libs/systemui/+/15571658

Change-Id: Ic74fcea770cb9a70810f163928a20bcd061f9917