Merge "[sensorservice] Fix inconsistent states in SensorDevice" into cw-f-dev