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: Ia92e578e5fcd52085503718dfa7c68ea431f4e76
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>