Merge "[automerger skipped] Merge "Adding in verification of calling UID in onShellCommand" into rvc-dev am: 7c905e103a am: ca34073d93 am: 8f6b8d313d am: 868bc803ff am: 264a36f6d0 am: 632a8b8a43 am: 7ffa627afc am: 9991339676 -s ours am: 92c1d53ff7 -s ours am: ffb3a20b9f -s ours" into udc-d1-dev-plus-aosp