Merge "Update getting formatted PhoneNumber method in Contact" into pi-car-dev