Merge "Revert "Revert "SettingsProvider enhanced cache""" into udc-dev am: 51095e26

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



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