[automerger skipped] Merge "Add the ability to include RCS capabilities in SIP...

[automerger skipped] Merge "Add the ability to include RCS capabilities in SIP PUBLISH" am: e6a96d3b am: e362fbb0 am: 254fdc0a -s ours

am skip reason: Change-Id Ie9a34715dbe8577471fd39c1a01d19b6b000bdf9 with SHA-1 6fa6c6dc is in history

Original change: https://android-review.googlesource.com/c/platform/frameworks/opt/net/ims/+/1621055

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I9003bf63f789e8f07647ff4e5e25f140b5557145