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

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

Change-Id: I2781346318531c2e0ada296644786bda3cafbf73