am 8eebe3b5: am dc70340d: Merge "Enable time format localization in keyguard" into klp-dev

* commit '8eebe3b5bcdbdb1998d17bb7a058bd9ba26234c9':
  Enable time format localization in keyguard