[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: 5265ba94 am: 348b33f6 -s ours

am skip reason: Merged-In Id988517e115611161e8eb25f695a37631112338c with SHA-1 2939d1de is already in history

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



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