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

Change-Id: I5e8fa0c4e382ec77d02211074c2c9005034a6343