Yes, when you start a California return in TurboTax, the program will add back any HSA contributions deducted on the Federal return.
If the HSA contributions were made in another state, as you noted, you can enter a subtraction in the California interview to restore the subtraction from Federal AGI, as was discussed in this thread.