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

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

Change-Id: Id65701e738cd523032166eb48e1aba052f55defa