Merge "Merge "Fix truncation in Allow diagonal scrolling" into udc-dev am:...

Merge "Merge "Fix truncation in Allow diagonal scrolling" into udc-dev am: 8c7aa844 am: bb29b528 am: 56f7e465" into udc-qpr-dev-plus-aosp am: f4fd8183

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



Change-Id: Ifd3bccc21707a77040359762d59a116ff56c1506
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>