[automerger skipped] Merge "Merge Android 13 QPR1" am: fb885aee -s ours am:...

[automerger skipped] Merge "Merge Android 13 QPR1" am: fb885aee -s ours am: 5810793b -s ours am: 311edb0c -s ours

am skip reason: Merged-In I6b073f730282ca68311b4407936871e65663cc7a with SHA-1 77a487a3 is already in history

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



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