Hide not disable, carrier logo

Change-Id: I7c3a08500825fb55f58d9be28dfa457f1d2c3853
Merge "Hide not disable, carrier logo" into kitkat