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

Change-Id: I63c6ff6e0aa8255d45165fb1d607aa21f9934fcc