Merge "Prevent settings from crashing when ContentProvider crashes" into oc-dev
am: a875bf3ebe

Change-Id: I50874232f14e40b142061aa113568cb7bfe7f176