Merge changes from topics "sip_transport_api_conn", "sip_transport_api_def"...

Merge changes from topics "sip_transport_api_conn", "sip_transport_api_def" am: c87a4311 am: ccc28352

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

Change-Id: I6e98f08baf6f8a847e37f0f6d88ce0179d8b972f