[automerger skipped] Merge "Merge Android 13 QPR2" am: bb4b2aa8e2 -s ours am: 3c03478887 -s ours

am skip reason: Merged-In I405dea123f5503fdc063ac88930a50b56ab4953b with SHA-1 5601e78800 is already in history

Original change: https://android-review.googlesource.com/c/platform/packages/services/Telephony/+/2487243

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