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

Merge "Fix truncation in Allow diagonal scrolling" into udc-dev am: 8c7aa844 am: bb29b528 am: 73db840b

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



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