Merge "Suppress flaky test in EditorCursorDragTest" into rvc-dev am: 3413d084c3

Change-Id: Ifd681f5f1daffdc9a02e1f76514487a49b769fa2