Merge "Unhide CalendarContract apis"