Merge "Cancel HandoverRetry when it's in wrong network state" into tm-qpr-dev am: 876dbf2d

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



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