Merge "Exclude AutoRevokeTest from GSI" am: 665ab543f2 am: 2382a75a26 am: b3b4685f8e

Original change: https://android-review.googlesource.com/c/platform/cts/+/1564497

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I09b39da0e65d1f47f1cb85f75777fadd0e7dc72a