Merge "Introduce permission flag for whitelisting permission from auto-revoke"