Merge "Removed the obsolete code" into udc-dev am: b0ca9f24 am: 29de134a

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



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