Merge changes from topic "Handle_Shutdown_Intent_sc-v2" into sc-v2-dev-plus-aosp am: 077189a9

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



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