[automerger skipped] Allow for more flexible vsync-offsets am: e203e04eeb
am: 831744932f  -s ours

Change-Id: I36354a84acddfe3de347af720d167504653dde69