Merge pull request #22203 from colemanw/revertContactDeletePermission