Merge "Cleaned up the deprecated APIs" into udc-dev am: 32c30564 am: 75f5386e

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



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