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