Merge "NetworkStackClient: Allow modules with network_stack uid" am: 891422900d am: e4b2d05705 am: beec6d629a
am: 64ec075206

Change-Id: I10c48fe9a926fd14f84cd1bfb434ac0286b39bd4