[automerger skipped] Merge "Merge 24Q3 to AOSP main" into main am: b4450ff481 -s ours am: 2a0de741f9 -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: I4a6c46ac301981d7aca4e2f22ef1cf4fde0126f6
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>