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