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

[automerger skipped] [DO NOT MERGE]Revert "Edge click and drag using the trackpad shouldn't trigger back" am: 59d28689 am: a49cce02 -s ours am: 62b5869d -s ours am: 82af9f48 -s ours

am skip reason: subject contains skip directive

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



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