Merge "Move no longer flaky tests into pre-submit" into qt-dev
am: 0fe2d3b75d

Change-Id: I4d6e246a41cf11a384c7fb107b8703fb353c79a5