Fix an issue where updating a Cloud Function that retires would add incorrect fields to the updateMask#8560

colerogers merged 3 commits intomasterfirebase/firebase-tools:masterfrom

colerogers.fix-update-field-maskfirebase/firebase-tools:colerogers.fix-update-field-maskCopy head branch name to clipboard