[automerger skipped] Merge Android U (ab/10368041) am: 201db258 -s ours am: 0f32d198 -s ours am: b0140345 -s ours

am skip reason: Merged-In Id93aa1ca981523fbbc2a8e27106999772313e7bb with SHA-1 b195c9e1 is already in history

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



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