Merge changes from topic "Handle_Shutdown_Intent_sc-v2" into sc-v2-dev am:...

Merge changes from topic "Handle_Shutdown_Intent_sc-v2" into sc-v2-dev am: 97e13dbd am: a5ea5e2d am: acc04270 am: 9544e967

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



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