Merge "Merge "Enable the CredentialManager Registry API" into udc-dev am:...

Merge "Merge "Enable the CredentialManager Registry API" into udc-dev am: 4610fcb3 am: 5762138e am: d9c67d34" into udc-qpr-dev-plus-aosp am: 870464f1

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



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