Previous implementation couldn't detect Wi-Fi connection while using a VPN. (cherry picked from commit 3155829994348af8325691b1b86f9e89e5eec249)
Previous implementation couldn't detect Wi-Fi connection while using a VPN. (cherry picked from commit 3155829994348af8325691b1b86f9e89e5eec249)