Merge "Fix 3298264: Update LockScreen DigitalClock with new font"