Merge "KeyStorage: don't request rollback resistance for wrapped storage keys"