Revert "Fix deadlock on SensorService" am: a96235081c am: d41c7c3e8c am: 1b6b3df590 am: c6de0e658d am: d70b912b77

Change-Id: I2ce4682bec16ab6d9c5b705eff959f49e1b0f64a