[automerger skipped] Merge "Properly support handover retry" am: d3e53c47...

[automerger skipped] Merge "Properly support handover retry" am: d3e53c47 am: f58b4742 am: d9f5328f am: adb2b8b8 -s ours

am skip reason: Change-Id I8e3cb41f15366477d686adf42851b6208a545c43 with SHA-1 fc46da82 is in history

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

Change-Id: I56f0f020b9b9ffe19ed7b5f85557197c99b2133a