Merge "Add NETWORK_STACK permission"
am: b23fabf3fd

Change-Id: I20f0278e080ccc957ce6342581f3d0f18dfb4b9a