Fixing edit eventlogging for abuse filter

With these fixes, matches behavior on Android I think. :)

Bug: 68401
Change-Id: I4caddbecf92c989f2e74ea6b76a88b29e1b50938
Merge "Fixing edit eventlogging for abuse filter"