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

Merge "Only allow scroll in one direction at a time" into rvc-dev am: 5f7043db am: cbe82da5 am: 829233f7

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

Change-Id: I9724750ceb126d6bdc1b1e638c4ee1ef0f86cff4