[automerger skipped] Merge "[DO NOT MERGE]Revert "Edge click and drag using the trackpad shouldn't trigger back"" into udc-dev am: 6bdae608fc am: 0c3f17d600 am: 7ef8844c41 -s ours
am skip reason: Merged-In Id988517e115611161e8eb25f695a37631112338c with SHA-1 2939d1dedf is already in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/23622757
Change-Id: Ic5c8b981ecce2955ac5c1f90311dd654fe7a4a30
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in: