[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 tm-dev am: 04edc239 am: 8c3c1fd9 am: 17eae43f -s ours

am skip reason: Merged-In I87517e9b116e5c6ca4ba05729139455c09a31d53 with SHA-1 3ae94b0d is already in history

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



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