Merge "Revert "sensorservice: Remove ENABLE_TREBLE flag.""