Merge "[SettingsProvider] fix caching of Global settings on non-system users"...

Merge "[SettingsProvider] fix caching of Global settings on non-system users" into udc-dev am: 3f92f627

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



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