Merge "simpleperf: fix flaky test TestApiProfiler."
am: 184821b4f0

Change-Id: Id953ebb3cfbebeaff09e837c1c084565820ad0fb