[automerger skipped] Merge "add shell user permissions for Asistant GTS tests"...

[automerger skipped] Merge "add shell user permissions for Asistant GTS tests" am: 193dfa0a am: 7ebd1382 am: 71375c86 -s ours am: 8d954453 -s ours am: 7c2bce27 -s ours

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

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Id150df02d8e3369e64e48186d6bc51ee82c6f73b