Merge "Cleanup swapped IMS connections." into tm-dev am: 74d1294e85 am: 030a332b9a

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

Change-Id: Ia34767bf7c9f0338b07505e8fe3186fab2d084a2
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>