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

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