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

* commit 'bb01e9b82f296102f9f5fdcf0545d61664e6ca06':
  Implement fallback clock in keyguard