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

Change-Id: I9c2d4aa6c696221b500562db7d4c352453d251ea