Follow up CL to move back auto revoke code

Bug: 182523293

Test: cts tests
Change-Id: I4796fc06c4077f725b291ca44b05f370894ec40d
2 files changed