[sensorservice] Fix inconsistent states in SensorDevice
am: 4f707f8b3d

Change-Id: I1090cee6b4b81e10d0b5bc31ab879b1a3788d407