Merge "Fixed build failure caused by the credentials sdk drop" into udc-dev...

Merge "Fixed build failure caused by the credentials sdk drop" into udc-dev am: 66696765 am: 6a81d9eb

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



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