am a35ada48: am 3ab3ffc6: am b7ae1990: am bd29b07e: Merge "Fix Keyguard drawn timeout" into mnc-dev

* commit 'a35ada4846d3794408825c10ee8a6070a1590044':
  Fix Keyguard drawn timeout