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

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



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