Merge "Shell: Grant NETWORK_STACK permission for CTS" am: 686594b470

Change-Id: Idf92a671e8d780b4d53219be184bc1983fbd2380