am 6689a7e8: am 44c4dd93: am 8990e28b: Merge "Update default keyguard clock to new UX specification" into klp-dev

* commit '6689a7e8efd559039465c37f577ef367f462cecc':
  Update default keyguard clock to new UX specification