[automerger] Revert workaround for missing frame callback am: 2ad2859f1e

Change-Id: Ie92ada3a301bad9cf0cdd355285503f656c8a125