Merge "update carrier id list to version 5"
am: d96849b747

Change-Id: Ic47bb615e96cdfad7bd33b77f821c7b2f1da6807