Merge "Merge "Merge "Only allow scroll in one direction at a time" into...

Merge "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" into rvc-qpr-dev-plus-aosp am: f90d058f

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

Change-Id: I2793ea285112ede09db9be5c056e9dbe255ce891