Merge "Add carrier config for sub6/mmwave/all unmetered"