[automerger skipped] Merge "Cancel HandoverRetry when it's in wrong network...

[automerger skipped] Merge "Cancel HandoverRetry when it's in wrong network state" into tm-d1-dev-plus-aosp am: c707e2c9 -s ours

am skip reason: Merged-In Ief834becf215ab843957f5f9ecf70f28273db0e5 with SHA-1 0ff92cf3 is already in history

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



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