Merge "Check that wifi, cell validates before tests" into main am: 1bc9f5c66d am: 1ec550b7a3 am: 6f799cc0f9 am: 08959f3d42 am: 3c7d97d16a

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

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