Merge "Reevaluate condition on handover retry" into tm-qpr-dev am: afbc06b6

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



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