[automerger skipped] Merge changes from topic "handover_retry" am: 985a3f05...

[automerger skipped] Merge changes from topic "handover_retry" am: 985a3f05 am: a1f98459 am: df893728 am: 94c69d53 am: 7b5d3c75 -s ours

am skip reason: Change-Id Ieb037f529aba3e889205dce6cdb1f26bce0b7274 with SHA-1 0330ecd0 is in history

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

Change-Id: I5051018b63e5839eff50fc921631e92b7a46ca6f