[automerger skipped] Merge "Update ImsPhoneCallTracker state on SRVCC...

[automerger skipped] Merge "Update ImsPhoneCallTracker state on SRVCC complete." am: a978ff87 am: 5377c779 -s ours am: d7e73ee5 -s ours am: e2f692da -s ours am: 50582dd4 -s ours

am skip reason: Change-Id Icb435f62465d1f7360afbc54009efe19cd87abbb with SHA-1 6269a0cf is in history

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

Change-Id: Ie6461ad63b74eed5c9c2988d54c2991f5a91bf4d