Avoid potential deadlocks in SensorService am: 967ce17e9d
am: 68259a8690

Change-Id: I00842fce4f6c0b6fb250bae63b371f862c4392f8