[automerger skipped] Merge "Update the format of RCS provisioning config XML" am: 323ca19c38 am: 46c07e0411 am: b8980e02e9 -s ours

am skip reason: Merged-In Id7e9cbf977872039a78796c0d3a45baedb481133 with SHA-1 2a2e05ae65 is already in history

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

Change-Id: I87b769531ba224ae1e48d3ca1a97f6c320f2e833