am 378c804d: am c8867b28: Merge "Report keyguard as initially showing and secure until we know" into klp-dev

* commit '378c804d652f32547d3fe460842e5720b57bd9f1':
  Report keyguard as initially showing and secure until we know