Revert "SettingsProvider enhanced cache"

This reverts commit 6c5d9a1aa4db1c9a5ab6d6adffd2033d08d7a0fd.

Reason for revert: testing for b/270623927

Change-Id: I625ff474ca1923ba09a20ceb7669f8e371c22026
6 files changed