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

am skip reason: Merged-In I2f74b2587b9a273cbc5c966a4bf76d4db23a43ac with SHA-1 2106364298 is already in history

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

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