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

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

Change-Id: I0cd8276825bc23baa0e3a2d4eaf2f2db55f679c2