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