Merge "Fix overscroll doesn't affect scrolling when released" into sc-dev am:...

Merge "Fix overscroll doesn't affect scrolling when released" into sc-dev am: ebde5e48 am: 95734a66

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/14681840

Change-Id: I4c111019c4e29b4f97a5e08f3d4b324e229ae52c