Merge "Revert "SettingsProvider enhanced cache"" into udc-dev am: 629235fcb7

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

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