tree 3a32c51ad515ba33d93f68f1aadba9cc29eb2dd6
parent 200d029332d7b9649804156926112198fba28299
parent bda18f27990706eb9081657282b58ebd66750bb3
author Song Chun Fan <schfan@google.com> 1666995673 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 1666995673 +0000

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

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>