Merge "Don't callback twice for app op changes in PermissionPolicyService."