Merge "Revert "Revert "[SettingsProvider] skip caching in system server""" into udc-dev am: 23cdcba71c am: e9d9b92141 am: fe92c4b2e1 am: f37514e6b9
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/22999028 Change-Id: I1324f98c76c19f5173867611059c404ecf93a8fb Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in: