Revert "FP4S-849 update carrier id, porting from fp5-1628"

This reverts commit 060ff06132afccc399ddd21d978a5af9e08bdea9.

Change-Id: I60186c8d053e04dce6032a84ee3675a8870d3625
2 files changed