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

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