Merge changes from topic "sysuig-shutdown-ui" into udc-d1-dev am: 4d6b1fa4 am: aef3ca62

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



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