Merge "Revert "Ensure keyguard is considered unlocked on devices that disable it.""