Merge "Improved the behavior of overscroll" into sc-dev am: 2b10a162 am: 2b767d5f

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

Change-Id: I967676effae957448861b77537e84fba20a51a36