[automerger skipped] Merge Android 13 QPR2 am: f6adaa0df5 -s ours am: 78f5ada3c6 -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: I6e37b813d21479f80c8e542335960053e2fb003a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>