Merge "Revert "Shell: Grant NETWORK_STACK permission for CTS""