[automerger] Fix issue with z order layering am: 90749604f4

Change-Id: Ia47a3a4e0cfbb7e42a818726fa59c88dc9ca57ea