WiFi: move ChannelHop and SSIDSwitchBack to matfunc

Those tests are no longer specifically flaky (pass rates > 98%), move
them out of suite:wifi_flaky to suite:wifi_matfunc.

BUG=chromium:1070269
TEST=./suite_enumerator.py wifi_flaky
TEST=./suite_enumerator.py wifi_matfunc

Change-Id: Id70dcdde84aadeb7a68b57a651ef493dfd2dbd36
Reviewed-on: https://chromium-review.googlesource.com/c/chromiumos/third_party/autotest/+/2277160
Commit-Queue: Harpreet Grewal <harpreet@chromium.org>
Tested-by: Nicolas Norvez <norvez@chromium.org>
Auto-Submit: Nicolas Norvez <norvez@chromium.org>
Reviewed-by: Harpreet Grewal <harpreet@chromium.org>
diff --git a/server/site_tests/network_WiFi_ChannelHop/control b/server/site_tests/network_WiFi_ChannelHop/control
index a18b4b7..727e7ea 100644
--- a/server/site_tests/network_WiFi_ChannelHop/control
+++ b/server/site_tests/network_WiFi_ChannelHop/control
@@ -6,7 +6,7 @@
 TIME = 'SHORT'
 NAME = 'network_WiFi_ChannelHop'
 TEST_TYPE = 'Server'
-ATTRIBUTES = ('suite:wifi_flaky')
+ATTRIBUTES = ('suite:wifi_matfunc')
 DEPENDENCIES = 'wificell'
 
 DOC = """
diff --git a/server/site_tests/network_WiFi_SSIDSwitchBack/control b/server/site_tests/network_WiFi_SSIDSwitchBack/control
index c496a9d..1700d34 100644
--- a/server/site_tests/network_WiFi_SSIDSwitchBack/control
+++ b/server/site_tests/network_WiFi_SSIDSwitchBack/control
@@ -6,7 +6,7 @@
 TIME = 'SHORT'
 NAME = 'network_WiFi_SSIDSwitchBack'
 TEST_TYPE = 'Server'
-ATTRIBUTES = ('suite:wifi_flaky')
+ATTRIBUTES = ('suite:wifi_matfunc')
 DEPENDENCIES = 'wificell'
 
 DOC = """