Merge "Require explicit userId in LockPatternUtils" into mnc-dev