am 18d669dc: Merge "Added logging to debug empty keyguard state" into mnc-dev

* commit '18d669dc597dc4997ee8d96f38cf138ae31a0cdf':
  Added logging to debug empty keyguard state