[automerger skipped] Merge "Shell: Grant NETWORK_STACK permission for CTS"...

[automerger skipped] Merge "Shell: Grant NETWORK_STACK permission for CTS" into rvc-dev am: 2e7834d3 am: efe17aca -s ours am: 315d3c9f -s ours am: def7125d -s ours
am skip reason: Change-Id I4f93e76bcda83c528f1f2c7bcf800965886ea8da with SHA-1 7df351b6 is in history

Change-Id: I8dbacfa3f5c349aa2a09e2cdb0d6e28e7d465f8d