[automerger skipped] Merge "[SettingsProvider] use a mock SettingsProvider in...

[automerger skipped] Merge "[SettingsProvider] use a mock SettingsProvider in unit test" into udc-qpr-dev am: 0d5aca04 am: f01bcfd5 -s ours

am skip reason: Merged-In I0f1ac5dcd9c689c3f414a7d3aa79da935f46fb5a with SHA-1 656b99ae is already in history

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



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