Merge "Integrate RCS provisioning updates into SipTransport" am: 11149deba4 am: 2d9c051d65

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

Change-Id: Ia905a6c97f963def63902e8ff600332bae335478