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 am: 8ffeb462

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

Change-Id: Ica97dffaac838bf5dc2071aedbe64eb2bdcb25b2