Fix fatal error in EditEntity in EditFilterMergedContent handling

Bug: 65726
Change-Id: I2e7296b0cc44a5fee73f2ba8eeef0fe291ebcb0c
Merge "Fix fatal error in EditEntity in EditFilterMergedContent handling"