Merge "Merge "Don't allow shell to spoof initiating package name." into rvc-dev am: 717f3d8401 am: e471179dab" into rvc-d1-dev-plus-aosp