am 135f086a: Merge "Add massive logging to investigate blank Keyguard" into lmp-dev

* commit '135f086a314690699229a98364b03e48e9651ec2':
  Add massive logging to investigate blank Keyguard