[automerger skipped] Removed the obsolete code am: 311f3743 am: 02f889a5 -s ours

am skip reason: Merged-In Ifbd767085e4567320e45bd480f7a7fc711c7d68a with SHA-1 f492ad2b is already in history

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



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