tree c55b8b0fe4dfdd9657d40345aed1d6793ae0ffee
parent 396312ec3bf6fc0b55329ad17faf7dde71dd54fa
parent d3415cdb42f49eb2ab99b2d808116e67e5f63686
author Brad Ebinger <breadley@google.com> 1619110279 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 1619110279 +0000

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