[automerger skipped] Merge "Add Shell permission to support manual testing"...

[automerger skipped] Merge "Add Shell permission to support manual testing" am: a2b92f89 am: 40bb8932 am: aff1739e -s ours

am skip reason: Merged-In I377cab85a1b39ef2887b452d1ffcdc5b00a8d5ab with SHA-1 c55590c8 is already in history

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



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