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

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

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