Merge "Add new setting key for credential manager default provider" into...

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

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



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