Merge changes from topics "sip_transport_api_conn", "sip_transport_api_def" am: c87a43111a am: ccc2835223 am: 8ffeb462fb am: 7860541df4

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

Change-Id: I21093871affa12c76c5091e7263cafb56fe1c682