Merge "Update the format of RCS provisioning config XML" am: 323ca19c38 am: 46c07e0411

Original change: https://android-review.googlesource.com/c/platform/packages/services/Telephony/+/1695145

Change-Id: Idfd8280fd176e8b64c75ead261d84510c78c5f87