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

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

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