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