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: I3d0cc20f4d99cc786f22e29850eef5b82712584a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>