[automerger] Accounting for one frame jump when starting a fling animation am: 9c3f172d9c am: 4205b54ca8

Change-Id: Ib7ed3d4bd38f901f9330db9800faf3d4eab31b73