Merge "Fix isActiveNetworkMetered for VPNs."