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

Change-Id: Ib3dde85ccea2fada1b6afc62e228298d9a520842