Pass Content into EditFilterMergedContent instead of an Entity

Create an actual content object to pass to the hook rather than only the entity.

Bug: 62406
Change-Id: I61de81ec5da504793f4166060cfce7c846d65edc