Move some no longer flaky tests to pre-submit

Bug: 124127512
Bug: 123654474
Test: self
Change-Id: I3fa53f0268d225d8e44b652a8bbf877531154244
3 files changed