am 515c6b44: Merge "fix an issue where SensorService could request an invalid sensor delay" into ics-mr1

* commit '515c6b44d57b829792267594a355cd2831582197':
  fix an issue where SensorService could request an invalid sensor delay