am deb71b28: Merge "Fix a possible SensorService deadlock." into lmp-dev

* commit 'deb71b2812702318900c36b7bcfa9759525ea7cc':
  Fix a possible SensorService deadlock.