Merge "[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" into rvc-qpr-dev-plus-aosp