Will bid for 2036 Olympics, sports infrastructure gaps being plugged: Mandaviya