[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 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: I8bd82d5b8ca4a4c8deac394c11acf5f1e7a35f26
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>