Merge "Invert the DONT_AUTO_REVOKE permission flag"