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

[automerger skipped] Merge "Cancel HandoverRetry when it's in wrong network state" am: a0c367bf am: 2b34a190 am: 5b4a5f36 -s ours am: 277eac8a -s ours am: 85bdedb8 -s ours

am skip reason: Merged-In Ief834becf215ab843957f5f9ecf70f28273db0e5 with SHA-1 99ec0b29 is already in history

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



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