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

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

am skip reason: Merged-In I2ffb1f89caf3f2c5bbf7d4dd693ad9a1bbc93fbb with SHA-1 496d3a3a is already in history

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



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