[automerger skipped] Merge 24Q3 (ab/11976889) to aosp-main-future am: b4cd5c9667 -s ours

am skip reason: Merged-In Id2809adad9d49ba72fc9b65647229efbc4575140 with SHA-1 10b5c36304 is already in history

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

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