Merge "Convert ProcNetTest to JUnit4." into main am: 7d2678c424 am: 21fa775301

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

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