[automerger skipped] Merge "Integrate RCS provisioning updates into...

[automerger skipped] Merge "Integrate RCS provisioning updates into SipTransport" am: 11149deb am: 2d9c051d am: 85badc52 -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: I3458ec299fca2b7aaac80af05d41c740fdc846cf