Merge "Cleaned up the deprecated APIs" into udc-dev am: eabe0a59

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/21543753



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