Merge "Add marker flag for permissions revoked by auto-revoke"