Merge "KeyguardManager set + validate lock API refinement"