[automerger skipped] Merge 24Q4 into AOSP main am: b3a412e4 -s ours am: ecaa8cbb -s ours

am skip reason: Merged-In I13a4ed323416d2887f5e9b2f38a7d4e34871c9d3 with SHA-1 f9a4857c is already in history

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



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