am 1cb3c1d3: am fc80fbe3: am 7bd0b652: am 4bdab6bb: Fix FLAG_DISMISS_KEYGUARD not working

* commit '1cb3c1d381c389c7ef903c1a871ff695cd406da4':
  Fix FLAG_DISMISS_KEYGUARD not working