Johnson last competed in the Octagon in April 2017 against Daniel Cormier