am 22662ef2: Merge change 1706 into donut

Merge commit '22662ef236cc99f0c19f450d9209da961c4868da'

* commit '22662ef236cc99f0c19f450d9209da961c4868da':
  Change cts tests to use InstrumentationTestRunner.