am 0e61ba8b: (-s ours) am 546f0c9c: am 2d70a47b: am a4a1c0d4: am ac275cb3: am...

am 0e61ba8b: (-s ours) am 546f0c9c: am 2d70a47b: am a4a1c0d4: am ac275cb3: am 1f3186ee: (-s ours) am 67a92975: am 88da2bfa: am ed529a5a: (-s ours) am 500ec9ce: am 25fb7133: am 0b2f2122: am d3da8f71: am ecba937b: DO NOT MERGE - Fix keyguard pattern lockout bug

* commit '0e61ba8b':
  DO NOT MERGE - Fix keyguard pattern lockout bug