[automerger skipped] Merge "DO NOT MERGE - Merge Android 13" am: c542b79d17 -s ours am: 4d55cfd550 -s ours

am skip reason: Merged-In Ia49f219d992bb64174d63c04bec83b65367e514a with SHA-1 7f5c275249 is already in history

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

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