Avoid potential deadlocks in SensorService
am: 967ce17e9d

Change-Id: Icf5c6e008f7e0050f699c0fe0b29a60ec5216e1f