Merge changes from topics "sip_transport_api_conn", "sip_transport_api_def" am: c87a43111a

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

Change-Id: Ib5c191e9e17ff8b82e266b9d3907bc96e0fde685