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

Change-Id: Id0e12e5c2c60042e8ba8eba55f7267781f55efca