[automerger skipped] Merge "Fix HorizontalScrollViewFunctionaTest" into...

[automerger skipped] Merge "Fix HorizontalScrollViewFunctionaTest" into udc-qpr-dev am: a59a744a am: fa0c281b -s ours

am skip reason: Merged-In I5342e21af8074e4a4ef69c79c63696f99cba436c with SHA-1 e2e039c9 is already in history

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



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