Merge "simpleperf: Remove unused variable" into main am: 38619fcdb5 am: 1c11b00748 am: 145c1190e1

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

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