Merge "move carrierconfig key disable_severe_when_extreme_disabled to res"