ChangeOpsMerge can ignore certain merge conflicts

Change-Id: I406a34b75f0556d15ef80d7ee551d159d51bb7d0
Merge "ChangeOpsMerge can ignore certain merge conflicts"