Merge "add shell user permissions for Asistant GTS tests" am: 193dfa0a19 am: 7ebd138270

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Id05953c7bdb08255d248b5f755d262dfa8098af5