[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 -s ours am: f11b4c88 -s ours
am skip reason: Change-Id I4f93e76bcda83c528f1f2c7bcf800965886ea8da with SHA-1 7df351b6 is in history
Change-Id: I34c966ba768e792a908229456a390a61cae2c475