Merge "Don't mutate permission state when setting app op from PermissionPolicyService."