[automerger skipped] Merge "add shell user permissions for Asistant GTS tests" am: 193dfa0a19 am: 7ebd138270 am: 71375c86d8 -s ours

am skip reason: Change-Id I293d66811f8a27170f2bc4cb74b7d4c9ec55fac8 with SHA-1 8308b4026a is in history

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I744235d66497fba8942852bf7429a050f8cc75e9