Merge "[SettingsProvider] fix configs cache update" into udc-dev am: f1f08c6f am: 0cfdae33

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



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