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

Change-Id: If031d0b3d41da26e9d167756668db098c7dca574