Merge "Suppress flaky test in EditorCursorDragTest" into rvc-dev am: 3413d084 am: a8552e3b am: 17ca3e3a Change-Id: I0ce44b62db0f34b627448efad31590e1cf3ce840