[automerger skipped] Merge "Add new carrier config option for enabling SIP...

[automerger skipped] Merge "Add new carrier config option for enabling SIP PUBLISH of RCS caps" into rvc-qpr-dev am: c905bf06 -s ours am: 9389dc60 -s ours

am skip reason: Change-Id If9ab9836261afc2d6cebb959690d8b44b06a3dfe with SHA-1 4612ab7b is in history

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

Change-Id: I352c4463866f566a20077586cce5aca3a5b8bc95