[automerger] Fix crash caused by removing update listener in update listener. am: 012d39a0e9 am: cd1727c069

Change-Id: Icd7aab53e7bd7cb65132f10ff752165ff57e2b46