Merge "Cleanup swapped IMS connections." am: 525b164de7

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

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