Merge "Use new SipDelegateConfiguration in telephony" am: 1d2bffe008 am: d3415cdb42 am: 500834da6f

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

Change-Id: I0c686b832e8b2277f621af88e8606681f2bc691f