Merge "Revert "Shell: Grant NETWORK_STACK permission for CTS"" am: 1e77133822

Change-Id: Ib5f2228b7f2ef60b37641fa06f63e49b784da8b9