[automerger skipped] Merge 24Q3 (ab/AP3A.240905.015) to aosp-main-future am: c9f7eef431 -s ours

am skip reason: Merged-In Ief292d6191471457a4aea11d9a3766034a855dd0 with SHA-1 655ed3d156 is already in history

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

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