Merge changes from topics "cp_sip_transport_supported_api",...

Merge changes from topics "cp_sip_transport_supported_api", "cp_sip_transport_supported_pipe" am: 9caec785

Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1453715

Change-Id: Iae859694e72a55c41f0bbf23bb6e5719f56bfed1