[automerger skipped] Merge "Update telephony lib components to remove...

[automerger skipped] Merge "Update telephony lib components to remove dupplication" into main am: b18d9d6e am: 8541c04f -s ours am: 9b3f3b25 -s ours

am skip reason: Merged-In Iddde4ef4c5736c02065b8c749a674a95555f5ec8 with SHA-1 3867a2b7 is already in history

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



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