California bill aims to pay for infrastructure through gas tax, fees