Merge changes from topic "Handle_Shutdown_Intent_sc-v2" into...

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

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



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