Merge "Add permission to NetworkStackService"
am: 967dd0a233

Change-Id: I858a3ad407c3ec14a69c6ff9c975de9e565d9c86