Merge "Revert "Mark CalendarProvider as required for all profiles""