am 2321a695: am 860c298b: am 440e1494: Merge "CTS Sensor: Perform EventOrderVerificationTest for all sensor types except ONE-SHOT" into lollipop-mr1-cts-dev

* commit '2321a695b1cc8ae3552bae5e2a9f7c20b9e7ffc9':
  CTS Sensor: Perform EventOrderVerificationTest for all sensor types except ONE-SHOT