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

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