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

* commit 'efbe7cc0ff5c85cc7956bb3099402c7ebbe20591':
  Fix FLAG_DISMISS_KEYGUARD not working