Merge "Support carrier config for NI SUPL message injection" into main