[automerger skipped] Merge "Handover retry checks for DATA_IS_DISCONNECTING"...

[automerger skipped] Merge "Handover retry checks for DATA_IS_DISCONNECTING" am: 6d1016af am: 4408f95e -s ours am: d7eef8a8 -s ours

am skip reason: Merged-In I3dfbb460f814f71fb8e29254d4e6db83621bbb9c with SHA-1 0f25310c is already in history

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

Change-Id: I4f29dd9108344e0a51f833da255594799c9c0b2e