Merge "[DO NOT MERGE]Revert "Edge click and drag using the trackpad shouldn't...

Merge "[DO NOT MERGE]Revert "Edge click and drag using the trackpad shouldn't trigger back"" into udc-dev am: 6bdae608

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



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