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

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