[automerger skipped] Switch data in ringing phase am: a8a2bd0d am: 6d156864 -s ours

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

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



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