[automerger skipped] Merge "Merge "Remove flaky test for cursor drag from presubmit" into rvc-dev am: e50d6658b6 am: 40c895bcb2" into rvc-d1-dev-plus-aosp am: 9ebc67e971 -s ours

am skip reason: Change-Id Ia27e05543e2647c42e06a684a3ae5c11c074a5fb with SHA-1 2654b6e238 is in history

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

Change-Id: Icee8ec42382133902996f5d70e528b731ed0b407