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

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

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