[automerger skipped] Merge "Don't allow non-system uids to use "android" as...

[automerger skipped] Merge "Don't allow non-system uids to use "android" as calling package." into sc-dev am: 8583436e am: ef2880d6 am: 59197685 -s ours

am skip reason: Merged-In I83537fde6cad2073e767d56c27cd25b82f29c235 with SHA-1 1db6b990 is already in history

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



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