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: 75b625a1

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



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