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

* commit '112a7457aedc694de9ba06359e738893e28c640a':