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

[automerger skipped] Merge "Prevent non-system ShutdownActivity from being launched by BatteryService" into udc-dev am: 692d7294 am: 17ce1a94 -s ours am: a4279de3 -s ours

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

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



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