base

b/3215774 Fix scrollMode notifications

When transitioning from a fling to a touch the mode was being set
to idle instead of ending up in scroll. This corrects the
notifications to get sent in the correct order.

Change-Id: Ideed6e4064b2be62788307f4232015fa88e101b4