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

Change-Id: Ibad0f3c552e6f88b177d3894232659c45464fe7d