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

[automerger skipped] Prevent non-system ShutdownActivity from being launched by BatteryService am: 413e9921 -s ours am: 5cc69b64 -s ours am: b6847924 -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: I462df5cd0c6d0e6b911b8281773e13a49b83fdc4
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>