tree 4f5bc271e0c1e37e745d09b17638c9abd4d0df6e
parent 3dc197f50313d87d8e1cbedcc64d59a85c5f700c
parent 500834da6fbe4719b36ea1dbb55e9debc1f5107e
author Brad Ebinger <breadley@google.com> 1619111618 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 1619111618 +0000

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