[automerger skipped] Merge "[DO NOT MERGE]Revert "Edge click and drag using...

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

am skip reason: subject contains skip directive

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



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