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

[automerger skipped] Merge "Prevent non-system ShutdownActivity from being launched by BatteryService" into udc-qpr-dev am: c73ce73c -s ours

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

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



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