[automerger skipped] Merge "[SettingsProvider] workaround for DevicePolicyResourcesManager" into tm-qpr-dev am: 053dd71dfd am: d958bbffff -s ours
am skip reason: Merged-In I37a6ceb29575593018b93093562c85d49770a43c with SHA-1 b127850fda is already in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/20302671
Change-Id: Ia9786797644767836264e2f1d67b7048e0bfb760
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in: