Merge "Fix 3148496: Update LockScreen clock to use new font."