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