Merge changes from topics "cp_sip_transport_supported_api", "cp_sip_transport_supported_pipe" am: 9caec78557 am: 371361d995 am: 666fbf6275

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

Change-Id: Ief02f6c15576358e18adf4869ad05653a55aa87a