[automerger skipped] Merge 24Q4 into AOSP main am: b3a412e4 -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/+/3411924



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