tree 27e0d0fbd8a5ec9422c03157132ad2ed0f19b067
parent 061fa5197ff78e24d615ab0531738197ba93a2b4
parent 094fdbea4b414e2d1a8b72eabc446f34c25f9151
author Brad Ebinger <breadley@google.com> 1655425408 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 1655425408 +0000

[automerger skipped] Merge "Cleanup swapped IMS connections." am: 525b164de7 am: 094fdbea4b -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: I051a036b49f49f33750ff49e5b220f1d5d73a556
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>