[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 skip reason: subject contains skip directive

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



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