Merge "Switch data in ringing phase" into tm-d1-dev am: 5edd456a

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



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