Merge "Prevent non-system ShutdownActivity from being launched by...

Merge "Prevent non-system ShutdownActivity from being launched by BatteryService" into tm-dev am: 0a0cd9d6

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



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