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

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



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