Merge "[sensorservice] Fix inconsistent states in SensorDevice" into cw-f-dev
am: 0627130b28

Change-Id: Ifa7a7da62d5862a261c491db9c2ed701e18ad59b