[automerger] Fix lock contention while swiping up am: 12c4ecb015

Change-Id: I4534687bc96a71e60c1e8ee3c0cc3ed92c65349c