Merge changes from topic "Handle_Shutdown_Intent_sc-v2" into sc-v2-dev am: 97e13dbd32 am: a5ea5e2d60
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/17348121 Change-Id: I86ef3483dbb69d0235bf67781b218dc0b2618648 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in: