[automerger skipped] Switch data in ringing phase am: c68af5f2 am:...

[automerger skipped] Switch data in ringing phase am: c68af5f2 am: f46998d9 -s ours am: a626ca6d -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: I028ae8f955dfd1d9c9e2c4d1cbee00c0d2bd1aae
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>