Merge "Update the Connectivity Manager test suit to use InstrumentationTestCase." into klp-dev