Refactor create contact and update contact for survey answer birth_date validation

Fix errors
Fix conflicts after merging MH-355 to dev