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

* commit '56f10c2685dd6f69c57744896e9bc7db129da447':
  Handle keyguard dismiss flags correctly