[automerger skipped] Merge "Move CredentialProviderInfo for test/settings...

[automerger skipped] Merge "Move CredentialProviderInfo for test/settings (framework)" into udc-dev am: 2f0523ee am: e90cc9d2 -s ours

am skip reason: Merged-In I2ffb1f89caf3f2c5bbf7d4dd693ad9a1bbc93fbb with SHA-1 8d08ee77 is already in history

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



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