Merge "Use new SipDelegateConfiguration in telephony" am: 1d2bffe008

Original change: https://android-review.googlesource.com/c/platform/packages/services/Telephony/+/1682948

Change-Id: I744852671f19a7896d1b88d549ac7436c32bcfa3