Merge "Disable flaky flicker tests" am: e56396645b

Change-Id: I5add5c709494699ef98eb6629325cb7060c5f4ef