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

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



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