Edits/annotations should not have any bundled aggregations calculated. (#12633)

Fixes a regression from 8b309adb (#11660)
and b65acead (#11752) where events which
themselves were an edit or an annotation could have bundled aggregations calculated,
which is not allowed.