Merge "Add carrier config for 5G Icon"