[automerger skipped] Merge "Prevent non-system ShutdownActivity from being...

[automerger skipped] Merge "Prevent non-system ShutdownActivity from being launched by BatteryService" into tm-dev am: 0a0cd9d6 am: 054ae802 -s ours am: 25e08dc8 -s ours

am skip reason: Merged-In I6c00b47d424d81712bd9634c31de4b7d2e9cbe31 with SHA-1 413e9921 is already in history

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



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