Merge changes from topic "datacallsession_handover" into tm-mainline-prod am: 831ff511

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



Change-Id: I3a6d904a8ebcd66b4787fbe90ffaa57bab66d4ef
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>