Move no longer flaky tests back to pre-submit

Bug: 123654474
Bug: 74078662
Test: this
Change-Id: Id162a2ba7a843d425e239d95b4b24657515e0b14
12 files changed