am e480582: AI 148455: CTS: Change tests in Android plan to use new Inst

Merge commit 'e480582d829a87e2d7097cb79b7afb9e4ccbf74a' into donut

* commit 'e480582d829a87e2d7097cb79b7afb9e4ccbf74a':
  AI 148455: CTS: Change tests in Android plan to use new InstrumentationCtsTestRunner