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: 4b48b448 am: 2302edad

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

Change-Id: Iadc45ba34183a9b6f6cfa0b47da33a843c4b9a32