A strike in India's Bollywood film and TV industry is over after executives agreed to implement better pay and working conditions for staff.