Merge "Don't allow non-system uids to use "android" as calling package." into...

Merge "Don't allow non-system uids to use "android" as calling package." into sc-dev am: 8583436e am: ef2880d6

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



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