[automerger skipped] Merge "[SettingsProvider] do not crash the system if...

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

am skip reason: Merged-In I9851991b4a225f2941708d37d2ad9507d7c432f8 with SHA-1 2ba72c06 is already in history

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



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