Merge "Fix incorrect values for VelocityTracker in SwipeDismissLayout." into cw-f-dev am: c61cd1a635
am: 34c98becbd

Change-Id: I4030b021838853ca3064d9da01a7d89a64d1861c