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

Change-Id: I8a75da68c03a904e932a84c0acbed60b84a0b92c