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

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