am 434b4acb: am 90fa5331: Merge "Don\'t show keyguard until the device has been provisioned." into klp-dev

* commit '434b4acb997484e7a540bf44bebd6b17c63fe270':
  Don't show keyguard until the device has been provisioned.