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

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

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