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

* commit 'a104c05da9d42375f7307cce58039f7edafaa078':
  Fix wrong stage exception in ChooseLockPattern