Controversial sheriff joining Trump team