[automerger skipped] Merge 24Q3 to AOSP main am: f9b7608075 -s ours am: 0dda21d152 -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: If75b68245a32dccef33c49a8af649866c87cf214
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>