am 4e485080: am 060ce6b5: am 9e06cbf5: am a104c05d: Merge "Fix wrong stage exception in ChooseLockPattern" into mnc-dr-dev

* commit '4e4850802b8be707e15f4e31327f26b5f34eac0a':
  Fix wrong stage exception in ChooseLockPattern