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

* commit 'dc70340d48eeddf4aa92a4d199179cde269c5bd4':
  Enable time format localization in keyguard