am cc99e0de: am 1f831156: Merge "Revert "Add android.hardware.cts.SensorTest#testBatchAndFlush to knownfailures"" into lollipop-mr1-cts-dev

* commit 'cc99e0de5806d7fc72b2ed58cd21b097fd7612bd':
  Revert "Add android.hardware.cts.SensorTest#testBatchAndFlush to knownfailures"