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

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

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