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

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

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