[automerger skipped] Merge "Add permission to shell for CTS test" into sc-dev am: bc9061fdf3 am: f245f49e05 -s ours
am skip reason: Merged-In Ia1995ec9503dbd2b12e0b5b5f92a96e02f85beec with SHA-1 bc4a843f18 is already in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/14621137
Change-Id: I2812edf28ac696bf428e9c26ad699f8248204aea
This commit is contained in: