Merge "Keyguard: Fix date and alarm clock letter spacing" into oc-dr1-dev
am: 99cc683647

Change-Id: I37e31c0a9c252439488c2fe64becd5f70ee16c04