[automerger skipped] Merge "Merge Android 14 QPR1" into main am: 7fdcb37d85 -s ours

am skip reason: Merged-In I1fbd86e4d1ba15fffe7da32728b2b0ed489e20c1 with SHA-1 cb2e4328ea is already in history

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

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