tree 52b88d2b94f72e5dc0376b0ad9c19a3d884d4d36
parent 8ad242f9c5567e72de0ff01fc9f187543f41edcf
parent f832729d49dc58d3f21c8beeac20fe797f92c813
author Brad Ebinger <breadley@google.com> 1603322319 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 1603322319 +0000

Merge changes from topics "cp_sip_transport_supported_api", "cp_sip_transport_supported_pipe" am: f832729d49

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

Change-Id: I5617dba85cb84922dc6733447dbee720722d25f7