Merge "Use correct lock screen type in KeyStoreRecoveryMetadata constructor."