Merge "KeyguardManager: add lock set and validation methods"