Merge "Revert "Mark the keyguard package as required for profile""