[automerger skipped] Merge sc-qpr1-dev-plus-aosp-without-vendor@7810918 am: 5fe00e20 -s ours am: c8661df6 -s ours

am skip reason: Merged-In I5c1f038864b952892aafeedd03d4c122d39e163d with SHA-1 31404fdd is already in history

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

Change-Id: I52206d22bfa17845a96bbe7c1a6c14d489ac5163