[automerger skipped] Fix ScrollViewFunctionalTest running on Test thread am: 67ccc66fc8 am: a840b41d56 -s ours

am skip reason: Merged-In I16637a2c958c16120c0451ab742a4c2e04093e6c with SHA-1 124e3e5ebb is already in history

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

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