Merge "Set up and tear down test network in TestNetworkRunnable" am: 1e071f9120

Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/1503692

Change-Id: I051f69d58f9511fb6ad0574963b217324f54b155