[automerger skipped] Merge "Removed codes related to hal version specific"...

[automerger skipped] Merge "Removed codes related to hal version specific" into udc-dev am: 2c19d88e am: 411095c9 -s ours

am skip reason: Merged-In Iff8f1a3a43d06474942e05cabf2d31ec3029603a with SHA-1 7bfebe1f is already in history

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



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