Merge "Mark the keyguard package as required for profile"