Merge "Merge "Don't allow shell to spoof initiating package name." into...

Merge "Merge "Don't allow shell to spoof initiating package name." into rvc-dev am: 717f3d84 am: e471179d" into rvc-d1-dev-plus-aosp am: 6201ad8e

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

Change-Id: I0a847f281a46f88d7e3defd0fbbf63a1cc6d1c40