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

Change-Id: I0c116a73bfb8ab82c798ebdf0ab587f00be031ed