Merge "Switch data during handover" into sc-dev am: 4476a9ce

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

Change-Id: If08370d044f21eaceaa9b797aeaf025a806bcbf2