am e7a02b24: Revert "Change cts tests to use InstrumentationTestRunner."

Merge commit 'e7a02b243e27420df5273e0276442225dd50839e'

* commit 'e7a02b243e27420df5273e0276442225dd50839e':
  Revert "Change cts tests to use InstrumentationTestRunner."