Whats best for Robotics/Mechatronics

Guys I’m really interested in the fields of Robotic and Mechatronics. However, I’m confused on which degree path I should take for it. I do plan on grad school after my undergrad. My current major is Mechanical Engineering, but I don’t feel like it’s going to give me the concentration in robotics like I want. Should I double major/minor in Electrical engineering as well? Or do my masters in Electrical engineering? I would also like a Master’s in Mechanical​ engineering as well. What combination should I do? I’m aware that there are classes available to mechanical engineers in robotics but there are very few offered at my current School and my planned transfer school. Thanks for helping.