[automerger skipped] Merge "Expose NETWORK_STACK permission for system and test API" am: 97c24fb167 am: 23fa19dce9 am: 4bf451c321 -s ours
am skip reason: Change-Id I27061280b0c49677fa651c6f9799e48b78e4c109 with SHA-1 b73c737ffc is in history

Change-Id: I58b0d00abbf0c598e0683f9599acb8340575b9e8