Add phone number while creating or editing address #5731

please make changes as discussed.