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

* commit '060ce6b5a77e629a1a317f7fe4c2c62fc5ed3c04':
  Fix wrong stage exception in ChooseLockPattern