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

Merge "Prevent non-system ShutdownActivity from being launched by BatteryService" into udc-dev am: 692d7294

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



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