Merge "simpleperf: improve test.py." am: fc095250db am: 92579a7f68

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

Change-Id: Iac3d387d7c0c889989cb95d32a7347dd5c76b29a