[automerger skipped] Merge "Fix codec metrics for CS MT calls" into sc-v2-dev...

[automerger skipped] Merge "Fix codec metrics for CS MT calls" into sc-v2-dev am: 8732e8c3 -s ours

am skip reason: Merged-In I74a310cffbad014c13803e0bba32b02d1516b95b with SHA-1 5298c129 is already in history

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

Change-Id: Ibe5914310fdfcac397f2653aabe7e757bcb02a26