Make auto-revoke waitForIdle less flaky

Bug: 153607914
Test: presubmit
Change-Id: I5d5285b1ae7898fb0c611150b18206b7f8cbfc6f
1 file changed