Merge "[sensorservice] temporarily remove Autolock mSensorsLock" into nyc-dev