Merge "[automerger skipped] Merge "Adding in verification of calling UID in...

Merge "[automerger skipped] Merge "Adding in verification of calling UID in onShellCommand" into rvc-dev am: 7c905e10 am: ca34073d am: 8f6b8d31 am: 868bc803 am: 264a36f6 am: 632a8b8a am: 7ffa627a am: 99913396 -s ours am: 92c1d53f -s ours am: 39476736 -s ours" into udc-d1-dev-plus-aosp am: f6e7cdb0 -s ours am: ae3bf11f -s ours

am skip reason: Merged-In I68903ebd6d3d85f4bc820b745e3233a448b62273 with SHA-1 3ef3f18b is already in history

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



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