Merge "Fix build failure due to the new credentials sdk drop" into udc-dev am: c6195cdc

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



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