Data Science at UC Berkeley

I applied to UC Berkeley and chose the Data Science B.A major. My primary interest is Computer Science. Have I made the right choice and can I apply for a Double Major in Computer Science and Data Science?