Merge "Start NetworkStack on system server start" am: 394b0d1a04
am: d69c3d4193

Change-Id: I00ce231850d69e32f836d8f508e28a4dc741226f