[automerger skipped] Merge "Add permission to shell for CTS test" am: 55f4ea8068 am: bdaa4ce995 -s ours am: 77a1964f4d -s ours
am skip reason: Merged-In Ia1995ec9503dbd2b12e0b5b5f92a96e02f85beec with SHA-1 bc4a843f18 is already in history
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1710636
Change-Id: Iee225a76653b58d147dd61b2fdff37409a544525
This commit is contained in: