[automerger skipped] Merge "Merge Android 14 QPR2 to AOSP main" into main am:...

[automerger skipped] Merge "Merge Android 14 QPR2 to AOSP main" into main am: 492983e9 -s ours am: f823f96e -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: I86d939f8d57ae6e050f9209be4c798d91214ae64
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>