Merge "Merge "Only allow scroll in one direction at a time" into rvc-dev am:...

Merge "Merge "Only allow scroll in one direction at a time" into rvc-dev am: 5f7043db am: ccfaf52f" into rvc-d1-dev-plus-aosp am: 31a90d44

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

Change-Id: I1616b396fe5b9a6b50e2fbaa5844cb0b5033d4cc