Merge "Migrate HostsideNetworkTestCase to use JUnit4" am: 1a59004c12 am: 581ad0bafa am: 62de07e424

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

Change-Id: I50f44483eea68259ebb56571cbc4edd40c7b6d94
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>