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

Change-Id: I21a935cb8272473254a95729f39b77c84ff8ea89