[automerger skipped] Merge 24Q4 into AOSP main am: 70f6c356 -s ours am: 2314d89b -s ours

am skip reason: Merged-In Ie97ef69f6f9e7209e65c600ac78639a1c40e0fd5 with SHA-1 882243e5 is already in history

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



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