Merge "simpleperf: Remove unused variable" into main am: 38619fcdb5 am: 074172b05d

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

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