Collapse duplicate $existingExpiry == 'infinity' case into else

Change-Id: I1cc612e9f646dd75f58cc6ae0ae073ebffa7d6d3
Merge "Collapse duplicate $existingExpiry == 'infinity' case into else"