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

* commit '326f4505e04b24f384e84da7efcefab256777a27':
  Update the Connectivity Manager test suit to use InstrumentationTestCase.