[automerger skipped] Merge "Integrate RCS provisioning updates into SipTransport" am: 236dbd41e8 am: ff98a82f2e am: e5217dfc16 -s ours

am skip reason: skip tag Change-Id I4b7e9ee4017f78cb465723592d8dcfa618f69421 with SHA-1 b647abed1f is already in history

Original change: https://android-review.googlesource.com/c/platform/packages/services/Telephony/+/1650825

Change-Id: I16374a865d6c8c6c12a70a144c92c68a7712ecb6