[automerger skipped] Merge "Add permission into Shell for CTS test" am:...

[automerger skipped] Merge "Add permission into Shell for CTS test" am: 6963e8d0 am: b487b585 -s ours am: 01be2495 -s ours am: fe41e83c -s ours

am skip reason: Merged-In I4ccd8fd5b153f28fa4b1463f7412bb8067cc4ffd with SHA-1 e66524d1 is already in history

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

Change-Id: I127d0c378625016e4e2cd5fd982c4fae33a79813