Merge "Consider motion events classification (for trackpad gestures) when cancelling current gesture" into udc-dev am: cb295bed am: 104124e0

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



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