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