AI 146179: am: CL 145971 am: CL 145757 Suppress the flaky tests
  Original author: yslau
  Merged from: //branches/cupcake/...
  Original author: android-build

Automated import of CL 146179
1 file changed