Merge "Check that wifi, cell validates before tests" into main am: 1bc9f5c66d am: 1ec550b7a3

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

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