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

[automerger skipped] Merge "Prevent non-system ShutdownActivity from being launched by BatteryService" into tm-qpr-dev am: 415c432a -s ours am: 8551182b -s ours am: 1a6f5dcb -s ours

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

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



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