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

Change-Id: I116011c73f20bdd3c23d58c19fc083e2387979ab