Merge "Merge "Remove flaky test for cursor drag from presubmit" into rvc-dev am: e50d6658 am: 40c895bc" into rvc-d1-dev-plus-aosp