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

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

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