[automerger skipped] Merge 24Q4 (ab/12406339) into aosp-main-future am: 28e36c7dbe -s ours

am skip reason: Merged-In Iada5e5b08e2885ff4d8ee3781760f84d2d58e2fb with SHA-1 e3b7edcc2a is already in history

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

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