[automerger skipped] Merge "Update the format of RCS provisioning config XML" am: fb0990fa0a am: 1b8695828d am: 7d68f0d274 -s ours

am skip reason: Merged-In I7df3c660326c6bee3db4a4d3a032ce8f1941b15b with SHA-1 e5017913a4 is already in history

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

Change-Id: I16e810ec5313f0e39a6b3e502d0800d2da718d18