Merge "Switch auto-revoke manifest flag to a tri-state" into rvc-dev am: 2f54a864 am: 18933631 am: b4a2275c Change-Id: I481cea9c1c9c7b47204029f5d30bbaf6cbe16e89