Merge "[SettingsProvider] workaround for DevicePolicyResourcesManager" into tm-dev am: bda18f27

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



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