[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: 77977a12 -s ours

am skip reason: subject contains skip directive

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



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