[automerger skipped] Merge Android 14 QPR2 to AOSP main am: 1b1530f8 -s ours...

[automerger skipped] Merge Android 14 QPR2 to AOSP main am: 1b1530f8 -s ours am: 5ec2d431 -s ours

am skip reason: Merged-In I866f9364f94a09466f6e021aa3b0f4f50a14f656 with SHA-1 84ea42d2 is already in history

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



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