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 am: 0c3f17d6

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



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