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

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



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