am 686edee8: am a2614354: Merge "Add a timeout for releasing SensorService wake_lock." into lmp-mr1-dev

* commit '686edee8e9894363caf8f01b370a6d3c9bc13e91':
  Add a timeout for releasing SensorService wake_lock.