Merge "ContentResolver should handle dead system_server." into pi-dev am: b35baa53f7
am: 04a3a098df

Change-Id: I5b6c0a5fbd61b0f1565b717d564ceb3c73b70024