[automerger skipped] Merge "[SettingsProvider] workaround for...

[automerger skipped] Merge "[SettingsProvider] workaround for DevicePolicyResourcesManager" into tm-dev am: bda18f27 am: 49e2be67 -s ours

am skip reason: Merged-In I37a6ceb29575593018b93093562c85d49770a43c with SHA-1 3b873ef5 is already in history

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



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