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

Change-Id: I968fa939194cc72ebabf1941514fa853eec85e39