[automerger skipped] Merge "Integrate RCS provisioning updates into SipTransport" am: 11149deb am: 2d9c051d am: 85badc52 -s ours am: cfae37d9 -s ours

am skip reason: skip tag Change-Id Ifabbe6a4c4cccef85c5c1b43fcb7876bad33e226 with SHA-1 840afdd0 is already in history

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

Change-Id: I7be613dc7df0e4e0837f7ac3a2e1406d3651b10c