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

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



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