[automerger skipped] Merge changes from topics...

[automerger skipped] Merge changes from topics "cp_sip_transport_supported_api", "cp_sip_transport_supported_pipe" am: 9caec785 am: 371361d9 am: 666fbf62 am: 0bd60517 -s ours

am skip reason: Change-Id I7fbd39a8ff17c4e947fdbcca148857684faa3252 with SHA-1 119076ae is in history

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

Change-Id: I29234ad9190b8be4457c258b2120cea5a8c6a4eb