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

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