Merge changes from topic "am-cc2061a0bd214cae81ba61ffef2304a6" into udc-qpr-dev-plus-aosp

* changes:
  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: ffb3a20b -s ours" into udc-d1-dev-plus-aosp am: 687e706a -s ours
  [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: ffb3a20b -s ours am: 788c66ec -s ours