am 6a0c6e72: am 9b6f8ac9: Merge "Don’t run the WifiConfig tests if there is no Wifi." into klp-modular-dev

* commit '6a0c6e72fa2f49a4aac8a00c5e1bd67da9310ffe':
  Don’t run the WifiConfig tests if there is no Wifi.