Fix null reference while patching phone and address, when customized …

[johnxjcheng]

Fix null reference while patching phone and address, when customized providers (derived from ProviderBase) are used. The original code handles null or empty child fields of phone number and address. But it did not handle the null condition of phone number and address itself.

[ghost]

All CLA requirements met.