Search for heavy charged long-lived particles in the ATLAS detector in 36.1 fb-1 of proton-proton collision data at s =13 TeV