Merge "Edge click and drag using the trackpad shouldn't trigger back" into...

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

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



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