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



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