[automerger skipped] Merge 24Q3 to AOSP main am: f9b7608075 -s ours

am skip reason: Merged-In I92f766de7e1ae30aba8ff18323e4efae2261dd04 with SHA-1 7ad83bfdac is already in history

Original change: https://android-review.googlesource.com/c/platform/packages/services/Telephony/+/3258374

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