[automerger skipped] Merge "Update ImsPhoneCallTracker with new...

[automerger skipped] Merge "Update ImsPhoneCallTracker with new CarrierConfigManager APIs" into main am: 2888fc7c am: 9b6a1789 -s ours am: 4691ac9d -s ours am: 1c507f43 -s ours am: d764650b -s ours

am skip reason: Merged-In Ifd10745e026a2520f8c2e5ca58036e1e13032e55 with SHA-1 ae5ed0dc is already in history

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



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