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

Change-Id: Ie126a3cdb190104f9e2b404d878f64bf7ec595ae