[automerger skipped] Merge 10952656 am: ba53c7d7ea -s ours am: f139fedd1f -s ours

am skip reason: Merged-In I19919ca8074ab200d31debc091a8f196e8018e6e with SHA-1 45f8de0fdb is already in history

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/SystemUIGo/+/25092613

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