Merge "Refactoring hostside network restrictions tests" into main am: 52113d6a9f am: bce14c6009

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

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