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

Change-Id: I46ddde0f99b5444ca8ffc6df1adbcdc9b5317c35