Merge "Fix for ScrollView absorbing fling stretch" into udc-dev am: 10a96d83 am: aaec7718 am: 7e092a1e am: e4ed9659

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



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