Show carrier label and custom (2/2)

Change-Id: Ida3321c9176e4e786fad96766dab056d8614360d
remove carrier label in keyguard and code cleanup

Change-Id: I8bbd656bf2165b5b810c53bce083faa02ca03463