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

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

Change-Id: I1494581f60bd0eaff57d6c3802e36afb3475fd54