[automerger skipped] Merge "Revert "Shell: Grant NETWORK_STACK permission for...

[automerger skipped] Merge "Revert "Shell: Grant NETWORK_STACK permission for CTS"" am: 1e771338 am: be8c96c9 -s ours am: 5a8d661b -s ours am: 015d23bf -s ours

am skip reason: Change-Id I5b933fe6850ebd5b5f230c16722357ead4ec4286 with SHA-1 dcfaed62 is in history

Change-Id: I8ab4652ca722f32666260e18e026b779121ce0ba