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 am: 68e5c819 am: 2f1032f3

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



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