Merge "Fix remving the contacts from the EAB failed because the contact should...

Merge "Fix remving the contacts from the EAB failed because the contact should be formatted." into sc-dev am: 507db838 am: 0f4af69d am: 59b388cd

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/opt/net/ims/+/14715998

Change-Id: I41b7491020fdc9181446200e2062729cf0a2d066