Merge "Add a carrier config for WFC's carrier name override by ef_pnn"