[automerger skipped] Merge "Add correct permissions check for GTS testing" am: 951fef3680
am: b3e46474de  -s ours

Change-Id: Iaead59263e7a87324fdcaa85202d3fa5eeb223e5