[automerger skipped] DO NOT MERGE Fixed the mering error am: e1ccdfff am:...

[automerger skipped] DO NOT MERGE Fixed the mering error am: e1ccdfff am: 469b124b -s ours am: c98135cf -s ours

am skip reason: subject contains skip directive

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



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