am cd3f1ce: am 0f009ff: AI 147986: Change CTS tests to use Instrumentati

Merge commit 'cd3f1cee8b213c49e8e72347b316e30334db7b9d'

* commit 'cd3f1cee8b213c49e8e72347b316e30334db7b9d':
  AI 147986: Change CTS tests to use InstrumentationCoreTestRunner, which has handled the @BrokenTest