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

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



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