[automerger skipped] Merge "move carrierconfig key disable_severe_when_extreme_disabled to res" am: 7be5365d am: e288ec2d am: 36208225 -s ours
am skip reason: Change-Id Ib12ff430c5781044ec0b36ac9b930224fc410c95 with SHA-1 49b3b168 is in history
Change-Id: I8e681c5ec2281e3d5a990e2779b0847f3525345d