[automerger skipped] Merge 24Q3 (ab/11976889) to aosp-main-future am: ebcaed2590 -s ours

am skip reason: Merged-In I9062ec0263cbad01089b0fb8a9d4fb806d1bb88a with SHA-1 c634b509b3 is already in history

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

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