Merge "Don't require WiFi in CtsHostsideNetworkTests." am: a38e1956a9 am: 056ecd792f

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

Change-Id: I97ee9377f08c9bae1f9a052d718e945666ed226e