am 7e72d990: Merge "Allow goldfish-setup to put the emulator in WiFi-only mode" into mnc-dev

* commit '7e72d990aff9cc9152c534678417b9e5448e0e42':
  Allow goldfish-setup to put the emulator in WiFi-only mode