am fdfa4b7d: am b579714c: am 8f837a69: Merge "Storing boot completed in KeyguardUpdateMonitor so it is persistent (issue 7492235)" into jb-mr1-lockscreen-dev
* commit 'fdfa4b7d':
Storing boot completed in KeyguardUpdateMonitor so it is persistent (issue 7492235)