[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" am: 88f8c04d am: f833ff0d am: 5f32287f -s ours

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

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

Change-Id: I17122ddace137ba1520f08be47927e8ec128e4d2