Merge "Resolve the merge conflict with the newest credentials sdk." into...

Merge "Resolve the merge conflict with the newest credentials sdk." into udc-dev am: c3a4320d am: ef588dc7

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



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