Merge "Cleaned up the deprecated APIs" into udc-dev am: 32c30564 am: 27a245b8

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/opt/net/ims/+/21528742



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