Merge "Added handover retry when previous data is still disconnecting" into...

Merge "Added handover retry when previous data is still disconnecting" into sc-dev am: 2311cebc am: c6ad7bc9

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

Change-Id: I13a575baff7ce08b9263701c418cd7ecf1eb4133