Merge "Add permission to shell for CTS test" into sc-dev am: bc9061fdf3

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

Change-Id: Ia3343e4f04533f59f56e0e02464f354fa1230418