[automerger skipped] Merge "DO NOT MERGE - Merge Android 13" am: 1ec345f2 -s...

[automerger skipped] Merge "DO NOT MERGE - Merge Android 13" am: 1ec345f2 -s ours am: 96f6bf9a -s ours am: a09d6a2e -s ours am: 1624b719 -s ours

am skip reason: subject contains skip directive

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



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