Merge "Rename KeychainProtectionParameter to KeychainProtectionParams"