am 8d1b0035: am 7b7ef437: Merge "Don\'t start the keyguard until boot is done." into lmp-dev

* commit '8d1b0035aa8fd147f0f6841cfac1c48158b78c9e':
  Don't start the keyguard until boot is done.