Merge "Update the format of RCS provisioning config XML" am: fb0990fa0a am: 1b8695828d

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

Change-Id: I4a01cbda145a09ef30302718dedc14d54238fd40