am 13b75939: am d4d2aa51: am efbe7cc0: am d1c82f8f: am 1cb3c1d3: am fc80fbe3: am 7bd0b652: am 4bdab6bb: Fix FLAG_DISMISS_KEYGUARD not working

* commit '13b75939596eec63c096fe9e85643b8c42a40b12':
  Fix FLAG_DISMISS_KEYGUARD not working