Merge "Add FrequencyRange comparator to ServiceState"