[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: e13a9f8f -s ours

am skip reason: subject contains skip directive

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



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