Merge "Add permissions to NetIntegrationTests manifest" am: cf46823faa
am: 089c0d9bc5

Change-Id: If487d15f3666af5460d886cfce78d87b6343e443