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

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

Change-Id: If1c63eb9bff844be0b35cd2400ff683bd566a239