Merge "Fix issue where upward syncs were requested from the CalendarProvider2 even if the sync was initiated by the SyncAdapter"