Merge "Rename auto-revoke manifest flags to not contain "Dont"" into rvc-dev