Merge "Expose NETWORK_STACK permission for system and test API" am: 97c24fb167 am: 23fa19dce9

Change-Id: I98ee22e6f3c7284a1951fa450203503f8eae3d0c