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

Change-Id: I647b52f1f47655a2d6f9bf90a0db82866c89e0c1