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