am 71ec4a81: am 253c4720: Merge "SensorService flush fixes." into lmp-dev

* commit '71ec4a8179a3f24de04e9a6ac824d896f1835170':
  SensorService flush fixes.