Merge "Merge "Don't require WiFi in CtsHostsideNetworkTests" into nougat-cts-dev am: a2989b5078" into nyc-dev
am: 2be6d78c13

Change-Id: I578972101d3b4c46132fc360be18a5dd947a4113