Merge "Add new setting key for credential manager default provider" into udc-dev am: 8bf55aeb

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



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