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 tm-dev am: 04edc239 am: 8c3c1fd9

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



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