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

Change-Id: I3112afafc8a912b459e6be5243396e7ca8c7ba93