Merge "Use new SipDelegateConfiguration in telephony"