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



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