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

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

Change-Id: Id369a526b18d70fdb72a5dcaf12092d6085efe27
tree: a47b739ba3004b481f09cf59c045ae34321f665d
  1. tests/