[automerger skipped] Merge "Ignore FlakyTests in test-mapping."
am: 1490293aa2 -s ours
am skip reason: change_id Ia2345b03d54deef9bd2f5ed67ae9ce2216507b10 with SHA1 3495d4f857 is in history

Change-Id: I057dbe58792ccbf0a254a65f17da4b6739a6fbd6