Merge "move carrierconfig key disable_severe_when_extreme_disabled to res"
am: 7be5365dc6

Change-Id: I5d01026c76c48658a1b02850becdf17dc11a6312