Merge "Adding a permission to Shell for testing" am: 7342dafaa5 am: 23f9ef4d2b

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

Change-Id: I6f02958325c6c6a5f944bf4220338e950b7b0d10