Merge "WifiManagerTest: Use addNetwork + enableNetwork instead of save" into rvc-dev