Merge "Revert "Revert "[SettingsProvider] skip caching in system server"""...

Merge "Revert "Revert "[SettingsProvider] skip caching in system server""" into udc-dev am: 23cdcba7 am: 6ff827bd am: 01842388 am: e6c091e4

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



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