Merge "Run perf-setup before running benchmark" am: 77c56f46d6 am: e7c904a43f

Original change: https://android-review.googlesource.com/c/platform/packages/modules/Virtualization/+/2506863

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