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: eeeca92e

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



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