am a9355bd1: Merge "Handle keyguard dismiss flags correctly" into lmp-mr1-dev

* commit 'a9355bd1c5d80777172103bd4e694972fedf8e54':
  Handle keyguard dismiss flags correctly