restore keyguard carrier font

Change-Id: Ie83d68e6d79b0cf95cb158e8368d8a538c038cf1

Conflicts:
	packages/Keyguard/res/layout/keyguard_carrier_text_view.xml