Merge "simpleperf: fix presubmit test after OpenCSD update." am: 6ef0007f50

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

Change-Id: I11a384e85c85315e064702bedbceed95e0e16042
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>