[automerger skipped] Merge "Toggle wifi when running CaptivePortalTest" into rvc-dev am: 3cc6da3e61 -s ours
am skip reason: Change-Id I31f9f4a9678e11042005c29535af840246358764 with SHA-1 fa761d5917 is in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/cts/+/11863009
Change-Id: I00d4a6bc63ff9489a732d404769018bd69b031bc
This commit is contained in: