Merge "Make Shell require permission for a new CTS test" am: e3548b2259 am: f453a23f6a am: 71f8e0fbc2

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

Change-Id: I8e36e6ac86d354094f2d0700da8a6f61bac56f5f