[automerger skipped] Switch data in ringing phase am: c68af5f2 am: f46998d9 -s ours

am skip reason: Merged-In I92039a196502561c1fe4955a5ae1b5695697402d with SHA-1 a8a2bd0d is already in history

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



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