[automerger skipped] Merge "Fix carrier ID retrieval in...

[automerger skipped] Merge "Fix carrier ID retrieval in VoiceCallSessionStats." into rvc-qpr-dev am: b1e6abcd -s ours am: 34e4f100 -s ours

am skip reason: Change-Id I971b4358f7dbf84bab95b4c72df04538a4c51b18 with SHA-1 9341ad95 is in history

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

Change-Id: I04df838d675746a60ade1fe20628ba663e84661d