[automerger skipped] Merge "DO NOT MERGE Fixed the mering error" into main am:...

[automerger skipped] Merge "DO NOT MERGE Fixed the mering error" into main am: 25a31ae6 am: 8983a66c -s ours am: 2dc214cf -s ours am: 5e963dc9 -s ours

am skip reason: subject contains skip directive

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



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