Consume unsafeIncludeUnexpired

Author: amcasey

src/DataProtection/DataProtection/src/KeyManagement/XmlKeyManager.cs

@@ -426,12 +426,14 @@ HashSet<XElement> GetElementsToRemove(IReadOnlyCollection<XElement> allElements)
                 out var redundantRevocationElements);
 
             var elementsToRemove = new HashSet<XElement>(ReferenceEqualityComparer.Instance);
+            var now = DateTimeOffset.Now;
 
             foreach (var pair in keyIdToKeyMap)
             {
                 var key = pair.Value;
                 var keyId = pair.Key;
-                if (shouldDelete(key))
+
+                if ((unsafeIncludeUnexpired || key.ExpirationDate < now) && shouldDelete(key))
                 {
                     _logger.DeletingKey(keyId);