* changes: DO NOT MERGE: Add unit tests to ensure VPN meteredness DO NOT MERGE: Fix ConnectivityController meteredness checks