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



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