Merge "Edge click and drag using the trackpad shouldn't trigger back" into udc-dev am: d9f0c546

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



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