[automerger skipped] Reevaluate condition on handover retry am: c211cbdf -s...

[automerger skipped] Reevaluate condition on handover retry am: c211cbdf -s ours am: 358e00b2 -s ours

am skip reason: Merged-In I50efebe9e8047fbc32396a7abbc7e171e94686a8 with SHA-1 7a75e50f is already in history

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



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