Merge "[SettingsProvider] workaround for DevicePolicyResourcesManager" into tm-qpr-dev am: 053dd71dfd

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

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