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

* commit '62a7022f7d831c166d7ffd198556df4a7f106510':
  Handle keyguard dismiss flags correctly