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

[automerger skipped] Merge "Update the format of RCS provisioning config XML" am: fb0990fa am: 1b869582 am: 7d68f0d2 -s ours am: 373c6933 -s ours

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

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

Change-Id: I2097d70fd63bf4a05c55491e9d2af4252333c385