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

am skip reason: Merged-In Iab225a5b733a78c6e0f8f5395f1516fe765994e2 with SHA-1 3b8a61fc is already in history

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



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