[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 udc-dev am: ffe032c1 am: a8e764de am: 23f444f9 -s ours

am skip reason: Merged-In I3e08f85d8d6c5de119f024a518d499dcd86f6006 with SHA-1 0e91977c is already in history

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



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