Merge "Add _default to the normal benchmark names." into main am: c6c3e0ba66

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

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