[automerger skipped] Clean up handover complete message in handover retry case...

[automerger skipped] Clean up handover complete message in handover retry case am: c1abb88d am: 81495964 am: f59ac3ca -s ours

am skip reason: Merged-In I5d9b386020fd85202cb667ec6648ebcaaf22a96c with SHA-1 365e080f is already in history

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

Change-Id: Ib4e0eedaf08621382823dbdfcd4b534d0cb9408f