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: I49d76b9895c3e8838b158aaaf917b36a86d9e7ff