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

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

Change-Id: Icabb84612057b380a581236d7e638d687589bf2e