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

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

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