Merge "Remove unnecessary locking around DefaultPermissionGrantPolicy."