Merge "Add RequiresPermission to TestNetworkManager" am: 94c8957576 am: 2e4fce8669

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

Change-Id: I8208c38f4c7a81a1217cc8aeca78374171eae69a