Merge "Add priv-app permissions for NetworkStack" am: f012a17962
am: b5d67e5d90

Change-Id: I1103826c2390b7ce73712e712ebb2da4eef2349d