Merge "[WifiConfigurationUtil] Improve Wi-Fi configuration validation"