Fix AutoRevokeTest flakiness issues

Bug: 163432048
Test: atest AutoRevokeTest a bunch before and after the fix
ensure attached issues sometimes reproduce without the fix,
and never with the fix
Change-Id: Id167136ddda1de7cb1f958d34e2611e1bbd619a3

Change-Id: I9b9a673d30ce4706e666c0e1066805b93189fef4
(cherry picked from commit 8dc84c3c054a5973b908de15af9bcbba6cd28f44)
1 file changed