[automerger] Fix lock contention while swiping up am: 570432f700

Change-Id: Ib7c958814612afd4104d1ad551f2644bed4a3547