[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: 4ff8b919 am: ec0bb4c7 -s ours am: 7dca0ea3 -s ours

am skip reason: subject contains skip directive

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



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