[automerger skipped] Merge "Shell: Grant NETWORK_STACK permission for CTS" into rvc-dev am: 2e7834d39e am: efe17aca3e -s ours
am skip reason: Change-Id I4f93e76bcda83c528f1f2c7bcf800965886ea8da with SHA-1 7df351b66f is in history

Change-Id: Id5742f65b4c8c87b09ac6b1267ce28e660f3c86e