Merge "Don't require WiFi in CtsHostsideNetworkTests" into nougat-cts-dev
am: dfc0ec200f

Change-Id: I7ff23d2936d7e9e21eaf8909b2e07c5c816cc32c