[automerger skipped] Merge "Prevent non-system ShutdownActivity from being launched by BatteryService" into tm-dev am: 0a0cd9d6b8 am: 054ae802de -s ours am: 25e08dc816 -s ours am: 5be6bb1aa5 -s ours am: 48334dd727 -s ours am: 1939e35cc2 -s ours

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

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

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