frameworks/base: code cleanup

Change-Id: I44ff60d2f7f0fe035a8297c5db92ee364ed84fdf
Port Custom Carrier Label from Mokee (1/2)