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



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