Merge "Comparator fields for HealthConnect Database Schema" into main