[automerger skipped] Merge "Update the format of RCS provisioning config XML"...

[automerger skipped] Merge "Update the format of RCS provisioning config XML" am: 3f4a3085 am: 4dfc2a5f am: 6f294a52 -s ours am: 08000e49 -s ours

am skip reason: Merged-In I16642ad3ddbd6561e32135269f488578c5bb436b with SHA-1 ea626b60 is already in history

Original change: https://android-review.googlesource.com/c/platform/frameworks/opt/telephony/+/1695105

Change-Id: I473ba8c3a24c3b3e51e4541f885d8ace3dd7c9ca