Move Carrier label into universal status bar header.

Also introduces a different height for the header area on keyguard,
as it looks better with less padding when no background is here (and
is closer to the mocks).

Change-Id: Ie9b94dcf823c3e4af83a22f5fae15d9033e146fd