Merge "Refactor PermissionPolicyTest"