Possibly. If not he will be drawn out in 2022. The 49 should lose most of what is left of its Orange county portion if the growth patterns are holding up.
California has an independent redistricting commission to make districts fair. The state's legislature doesn't handle redistricting.
I know. Someone can still be drawn out even with a non-partisan commission. It's why I mentioned the growth in Orange and San Diego County. If that holds up, the 49 will have to be entirely based in San Diego, which will make it much more Dem.