Merge "Run auto revoke command twice" into mainline-prod am: 9f1020fb75

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

Change-Id: I2d993d7586999430952b916398f607fce5655842