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

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



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