Merge "Fix for ScrollView absorbing fling stretch" into udc-dev am: 10a96d83 am: f927c565 am: 75ab2983

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



Change-Id: I245b351d3a431b1c4778a0dcb2ae4969a6e94cdf
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>