am 40962880: Merge "Implement fallback clock in keyguard" into jb-mr1-lockscreen-dev

* commit '40962880225c74d8f776e6ce03f1ec6dde63ef04':
  Implement fallback clock in keyguard