Merge "[SettingsProvider] do not crash the system if config settings files are...

Merge "[SettingsProvider] do not crash the system if config settings files are broken" into udc-qpr-dev am: fb224c59

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



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