[automerger skipped] Merge "Merge credential manager providers by package name" into udc-dev am: e87159a591
am: 712129d759
-s ours
am skip reason: Merged-In Id48f27e96cabdd8ab0e8cbafc8eb760b7bbbf928 with SHA-1 043ba28892
is already in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/21964743
Change-Id: I935a6e7e51d3665a17da27b6a8ddd6a6e25dee37
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in: