[automerger] Fix use-after-free in proxy resolver am: ed9838b89e am: cdc21af3ac am: 44ef83511e am: 46b849f363
am: cfac906e4e

Change-Id: I795840c6d3781015501785f72fbf1e711da8ef41