remove carrier label in keyguard and code cleanup

Change-Id: I8bbd656bf2165b5b810c53bce083faa02ca03463