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

Merge "Merge "Add new setting key for credential manager default provider" into udc-dev am: 8bf55aeb am: eeeca92e" into udc-d1-dev-plus-aosp am: 3c2b65dc am: fe162937

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



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