[automerger] Do not run StateHandler code while holding the lock am: f46779fe01

Change-Id: I2281b44fd9cc4156a759cb3828b2829d324439cd