Merge "Toggle wifi when running CaptivePortalTest" am: 1ae290c1a6

Original change: https://android-review.googlesource.com/c/platform/cts/+/1336114

Change-Id: I4a878a7d328a7a001355e092b81e1e3635dcb853