[automerger skipped] Merge "Refactoring hostside network restrictions tests" into main am: 52113d6a9f am: 7e16ee0610 -s ours

am skip reason: Merged-In Ibc614d74f46d436cad4586c1d309bbb3648b8eb1 with SHA-1 52732642fa is already in history

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

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