[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 am: 8f4a6a70 -s ours am: 0e466cd7 -s ours

am skip reason: subject contains skip directive

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



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