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 am: 8e8c5949

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

Change-Id: I1dcaa6b75a19927ae4a810770ce0f75accac6fe5