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

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

Change-Id: Ic8607825fef68b1b067c21d0c8947d23da7f8c06