Merge "Add NETWORK_STACK permission" am: b23fabf3fd am: 09146fc440 am: d6b2e7ac93
am: fa84050a7e

Change-Id: If1abfc3a7ee596e23257d0259bc5d0243f31e82b