[automerger skipped] Merge "Move CredentialProviderInfo for test/settings (settings)" into udc-dev am: 9e2e47c553
am: 6170c608f2
-s ours
am skip reason: Merged-In Ief25f562eb5c2ca4438701de8a8e26941a8370a3 with SHA-1 573e844275
is already in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/21546156
Change-Id: Ifee561503952253f4188e72125e8174cd6893276
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in: