Merge "NetworkStackClient: Allow modules with network_stack uid" am: 89142290 am: e4b2d057 am: beec6d62 am: 64ec0752 Change-Id: I10c48fe9a926fd14f84cd1bfb434ac0286b39bd4