[automerger skipped] Merge "Adding a permission to Shell for testing" am: 7342dafa am: 23f9ef4d am: fd036220 -s ours

am skip reason: skip tag Change-Id Ia0f8afa6dc1a13c95553b691f352c6d8c7ae5ccf with SHA-1 b0db6997 is already in history

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

Change-Id: I80c586492f04250f71a9534f167d5e1245687a73