Merge "Add required permission to FrameworksNetIntegrationTests" am: 4f62a89c9e am: 36a95aa83a am: f86bf5259e

Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1661659

Change-Id: Ibb523b767c246701d8024f618491c8a125beca18