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

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

Change-Id: Iefb4d5932bbd0e3b2a3f80e8b23fc4f247bfdd63