Merge "simpleperf: fix flaky test." am: bfe2189925

Original change: https://android-review.googlesource.com/c/platform/system/extras/+/1585190

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I35387c9e810ff936b22dcc4c3d8e58c76db612d7