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

Change-Id: Ib120f3d95f5832bac13155f6d78376c3941d4a99