Merge "Merge "Switch auto-revoke manifest flag to a tri-state" into rvc-dev am: 2f54a864 am: 18933631" into rvc-d1-dev-plus-aosp