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 am: 4128ee0e

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

Change-Id: I04e17485077d7768e761b5c1156ee60a284d0440