Merge "Add shell permission for CTS test" am: 94dd832f60 am: 24d521a6bb

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

Change-Id: Ib5e6052391cddcd2a466088b9ebe70e6a1d5466f