am 7d83f602: am 928ec5e0: Merge "Modify connectivity manager test suite so that it can be run on Wi-Fi only device." into honeycomb

* commit '7d83f6020c31c21b84114b35e6303895d082e18d':
  Modify connectivity manager test suite so that it can be run on Wi-Fi only device.