[automerger skipped] Merge Android 14 QPR3 to AOSP main am: aba3380999 -s ours

am skip reason: Merged-In I684660ce44e8a71706c915543c69c21481829699 with SHA-1 d8ea43539e is already in history

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

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