am edae80e0: am a3e9a836: Merge "Simpleperf: fix flaky workload unit tests."

* commit 'edae80e066445ee0b370f32a965d6a5d6dcfafee':
  Simpleperf: fix flaky workload unit tests.