Revert: Return: Custom Carrier Label [2/2]

Change-Id: I3cb9adf36d5fda8a088b8df3781428b0d7adb899
Show Statusbar Carrier and Custom label [2/2]

    Ported to AOSPA from N5X CM11 Based by @AragaoAnderson

Change-Id: Id6e8c217ec26e111e25798f3ad00e874db1203c2