[automerger] bug fix: restore support for broken flag am: 8d009afdbb  -s ours am: 368589ea3d

Change-Id: If59793229ee92fe1c0268ef6b8bf750b9c76752f