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