[automerger skipped] Merge aosp-24Q3-ts-dev am: f0ea9856 -s ours

am skip reason: Merged-In I918f6562949e32d3581bf0a69c9bfe02dce1cd3b with SHA-1 f5fb983f is already in history

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/opt/telephony/+/28853243



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