[automerger skipped] Fixed IMS handover behavior on roaming network am:...

[automerger skipped] Fixed IMS handover behavior on roaming network am: e8ccf210 am: 2a182716 -s ours am: 202bcd67 -s ours am: d4191695 -s ours

am skip reason: Merged-In I5cf7c3ac67ca1be40dcd6eba184db29ed64afec5 with SHA-1 08a3766f is already in history

Original change: https://android-review.googlesource.com/c/platform/frameworks/opt/telephony/+/2095847



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