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

Change-Id: I1f32ff38603d5a8480f90da0ef76bb3247910cd9