Merge "Allow Shell to have permission for CTS." into tm-dev am: a2df99e5 am: b59b661e

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



Change-Id: Iadbc04712488b2dac90763c7d994421efdbb1afa
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>