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



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