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

Change-Id: I5ca0d7484f7585d25eb76fdb670c7ce0f0d96668