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

[automerger skipped] Switch data in ringing phase am: a8a2bd0d -s ours am: c75b5dbb -s ours am: 528ad676 -s ours am: 5603b7be -s ours

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

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



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