Merge changes I387b9283,If02befcd into main

* changes:
  [SB] Upgrade ConnectivityRepositoryImplTest to latest and greatest.
  [SB] Always check underlying wifi networks regardless of transport type.