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

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



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