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



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