[automerger skipped] DO NOT MERGE - Merge Android 13 am: 7475d225 -s ours...

[automerger skipped] DO NOT MERGE - Merge Android 13 am: 7475d225 -s ours am: c9f6516d -s ours am: 1445d34b -s ours am: 0e1766f7 -s ours

am skip reason: subject contains skip directive

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



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