[automerger skipped] Merge "Cleanup swapped IMS connections." am: 525b164de7 am: 094fdbea4b -s ours am: 1c1485c437 -s ours

am skip reason: Merged-In Ied32aed9ae0948c40cd3daf6bb70b4fdeebdd7f8 with SHA-1 6d55213fb3 is already in history

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

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