[automerger skipped] Merge changes from topic "sysuig-shutdown-ui" into...

[automerger skipped] Merge changes from topic "sysuig-shutdown-ui" into udc-d1-dev am: 4d6b1fa4 am: aef3ca62 am: 47ddae52 -s ours

am skip reason: Merged-In Iab225a5b733a78c6e0f8f5395f1516fe765994e2 with SHA-1 5acb3843 is already in history

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/23098159



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