Merge "Use AppOpsController for AlarmsAndReminders" into main