Cleaned up the deprecated APIs am: 2034e081 am: 2cdebbd5

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



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