[automerger skipped] Merge sc-v2-dev-plus-aosp-without-vendor@8084891 am: 820707d6 -s ours am: e263f7dd -s ours

am skip reason: Merged-In I4e434816b505b320b78efd90c910bc0a464e6175 with SHA-1 fabee838 is already in history

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

Change-Id: Id405681e9b354681bc21bb5f0f70a81187a7c726