[automerger skipped] Merge "Fixed data disconnected during handover" am:...

[automerger skipped] Merge "Fixed data disconnected during handover" am: e6df08f3 am: f19ae2d5 am: e674e4cf -s ours

am skip reason: Merged-In Icf754443719c0798b843feddd8f34f07cb5fac8b with SHA-1 a5131eae is already in history

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

Change-Id: I0415334f338afaa76ac0ee77efb057d2ed19e847