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: 4ff8b919

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



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