Merge "Limit overscroll stretch for animation" into sc-dev am: b42f19e2 am: 2d628c1c

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

Change-Id: I14841b1ff39308c67a18be65f437452059b97075