Merge "KeyguardManager: clarify behavior for profile with separate challenge" into main